提交 858df170 编写于 作者: L Liangliang He

Fix adb_tools.py

上级 fd3eeb9e
import sh import sh
import re import re
def strip_invalid_utf8(str):
return sh.iconv(str, "-c", "-t", "UTF-8")
def adb_split_stdout(stdout_str): def adb_split_stdout(stdout_str):
stdout_str = strip_invalid_utf8(stdout_str)
# Filter out last empty line # Filter out last empty line
return [l.strip() for l in stdout_str.split('\n') if len(l.strip()) > 0] return [l.strip() for l in stdout_str.split('\n') if len(l.strip()) > 0]
...@@ -13,7 +17,6 @@ def adb_devices(): ...@@ -13,7 +17,6 @@ def adb_devices():
def adb_getprop_by_serialno(serialno): def adb_getprop_by_serialno(serialno):
outputs = sh.adb("-s", serialno, "shell", "getprop") outputs = sh.adb("-s", serialno, "shell", "getprop")
raw_props = adb_split_stdout(outputs) raw_props = adb_split_stdout(outputs)
props = {} props = {}
p = re.compile("\[(.+)\]: \[(.+)\]") p = re.compile("\[(.+)\]: \[(.+)\]")
for raw_prop in raw_props: for raw_prop in raw_props:
...@@ -26,5 +29,5 @@ def adb_get_all_socs(): ...@@ -26,5 +29,5 @@ def adb_get_all_socs():
socs = [] socs = []
for d in adb_devices(): for d in adb_devices():
props = adb_getprop_by_serialno(d) props = adb_getprop_by_serialno(d)
socs.append(props["ro.product.board"]) socs.append(props["ro.board.platform"])
return set(socs) return set(socs)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册