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

Merge "gdbclient.py: Try ro.build.product also." am: 8240673629 am: 9eec3d5f5b am: 76a0f6577e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1421388

Change-Id: Id8b7e4068ac9d18c09fba4b0f633cd3e17c06120
This commit is contained in:
Treehugger Robot
2020-09-11 07:31:17 +00:00
committed by Automerger Merge Worker
parent c8b08c8233 76a0f6577e
commit 8f54c8ff19
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/gdbclient.py
View File

@@ -129,11 +129,11 @@ def parse_args():
def verify_device(root, device): def verify_device(root, device):
name = device.get_prop("ro.product.name") names = set([device.get_prop("ro.build.product"), device.get_prop("ro.product.name")])
target_device = os.environ["TARGET_PRODUCT"] target_device = os.environ["TARGET_PRODUCT"]
if target_device != name: if target_device not in names:
msg = "TARGET_PRODUCT ({}) does not match attached device ({})" msg = "TARGET_PRODUCT ({}) does not match attached device ({})"
sys.exit(msg.format(target_device, name)) sys.exit(msg.format(target_device, ", ".join(names)))
def get_remote_pid(device, process_name): def get_remote_pid(device, process_name):