LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move away from device.get_props.

Browse Source 
Properties can include \n so get_props isn't sound, and it's not obvious how
to fix it (without adding something like cat's -v to getprop, which wouldn't
help the intended use case of working with arbitrary old devices).

Bug: https://issuetracker.google.com/37093233
Test: gdbclient -r /system/bin/date
Change-Id: I96042fd44f1de17974968954fab6c916a9d13b61
This commit is contained in:
Elliott Hughes
2017-06-02 13:15:59 -07:00
parent ddd86bd217
commit 1a2f12d23e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/gdbclient.py
View File

@@ -74,8 +74,8 @@ def dump_var(root, variable):
return make_output.splitlines()[0] return make_output.splitlines()[0]
def verify_device(root, props): def verify_device(root, device):
names = set([props["ro.build.product"], props["ro.product.device"]]) names = set([device.get_prop("ro.build.product"), device.get_prop("ro.product.device")])
target_device = dump_var(root, "TARGET_DEVICE") target_device = dump_var(root, "TARGET_DEVICE")
if target_device not in names: if target_device not in names:
msg = "TARGET_DEVICE ({}) does not match attached device ({})" msg = "TARGET_DEVICE ({}) does not match attached device ({})"
@@ -216,13 +216,11 @@ def main():
if device is None: if device is None:
sys.exit("ERROR: Failed to find device.") sys.exit("ERROR: Failed to find device.")
props = device.get_props()
root = os.environ["ANDROID_BUILD_TOP"] root = os.environ["ANDROID_BUILD_TOP"]
sysroot = dump_var(root, "abs-TARGET_OUT_UNSTRIPPED") sysroot = dump_var(root, "abs-TARGET_OUT_UNSTRIPPED")
# Make sure the environment matches the attached device. # Make sure the environment matches the attached device.
verify_device(root, props) verify_device(root, device)
debug_socket = "/data/local/tmp/debug_socket" debug_socket = "/data/local/tmp/debug_socket"
pid = None pid = None