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 | |
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')
-rwxr-xr-x | ndk-gdb | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -517,13 +517,14 @@ adb_var_shell CPU_ABI2 getprop ro.product.cpu.abi2 # Both CPU_ABI1 and CPU_ABI2 may contain multiple comma-delimited abis. # Concatanate CPU_ABI1 and CPU_ABI2 and replace all ',' with space. # Add trailing space to ease whole-word matching of APP_ABI. -CPU_ABIS="$CPU_ABI1,$CPU_ABI2," +CPU_ABIS="$CPU_ABI1,$CPU_ABI2" CPU_ABIS=$(echo $CPU_ABIS | tr ',' ' ') log "Device CPU ABIs: $CPU_ABIS" -for APP_ABI in $APP_ABIS; do - if [ "$CPU_ABIS" != "${CPU_ABIS%$APP_ABI *}" ] ; then - COMPAT_ABI=$APP_ABI +APP_ABIS=$APP_ABIS" " +for CPU_ABI in $CPU_ABIS; do + if [ "$APP_ABIS" != "${APP_ABIS%$CPU_ABI *}" ] ; then + COMPAT_ABI=$CPU_ABI break fi done |