diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-08 14:22:19 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-09 09:59:04 +0800 |
| commit | 5f2f1101d7560844b26ac330b1b8d925984e7f1b (patch) | |
| tree | 9c4f1952d25cd7a191973c98dc7634a6a9e9fc32 /ndk-gdb.py | |
| parent | 71d7a6a810427f8d41c754fd48fc67452f150c18 (diff) | |
| download | ndk-5f2f1101d7560844b26ac330b1b8d925984e7f1b.tar.gz | |
Fix ndk-gdb to search compatibile ABI in order of CPU_ABIS
Instead of in the order of APP_ABIS, which will miss armeabi-v7a
if APP_ABI := armeabi armeabi-v7a (note that armeabi appears first
and get matched)
ndk-gdb.py looks in the order of CPU_ABIS already. Fixed two
bugs (unrelated nonetheless).
See https://code.google.com/p/android/issues/detail?id=54033
Change-Id: I4c97e90a552a16598295e0b1597882f7d3c939b8
Diffstat (limited to 'ndk-gdb.py')
| -rwxr-xr-x | ndk-gdb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndk-gdb.py b/ndk-gdb.py index 9cd3794e0..e464606a0 100755 --- a/ndk-gdb.py +++ b/ndk-gdb.py @@ -588,7 +588,7 @@ After one of these, re-install to the device!''' % (PACKAGE_NAME)) error('''It seems that your Application does not have any launchable activity! Please fix your manifest file and rebuild/re-install your application.''') - if len(OPTION_LAUNCH): + if OPTION_LAUNCH: log('Launching activity: %s/%s' % (PACKAGE_NAME,OPTION_LAUNCH[0])) retcode,LAUNCH_OUTPUT=adb_cmd(True, ['shell', 'am', 'start', '-n', '%s/%s' % (PACKAGE_NAME,OPTION_LAUNCH[0])], @@ -606,7 +606,7 @@ After one of these, re-install to the device!''' % (PACKAGE_NAME)) retcode,PID = get_pid_of(PACKAGE_NAME) log('Found running PID: %d' % (PID)) if retcode or PID == 0: - if len(OPTION_LAUNCH): + if OPTION_LAUNCH: error('''Could not extract PID of application on device/emulator. Weird, this probably means one of these: |