Add support for 64-bit devices when using gdb on Android

Change-Id: I25c230dc7f417f3e09a01011377e6e0c7814092a
Reviewed-on: https://skia-review.googlesource.com/6689
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver
index 12d055a..184bd6a 100755 (executable)
--- a/platform_tools/android/bin/android_gdbserver
+++ b/platform_tools/android/bin/android_gdbserver
@@ -15,6 +15,14 @@ then
   exit 1
 fi
 
+IS_64_BIT="false"
+GN_TARGET_CPU=$(grep target_cpu ${SKIA_OUT}/args.gn)
+if [ -z "$GN_TARGET_CPU"]; then
+  IS_64_BIT="true"
+elif [[ $GN_TARGET_CPU == *64* ]]; then
+  IS_64_BIT="true"
+fi
+
 # We need the debug symbols from these files
 GDB_TMP_DIR=$SKIA_OUT/android_gdb_tmp
 mkdir -p $GDB_TMP_DIR
@@ -47,7 +55,7 @@ for library_file in \
     fi
 done
 
-if [[ $ANDROID_ARCH == *64* ]]; then
+if [[ $IS_64_BIT == "true" ]]; then
   adb_pull_if_needed /system/bin/linker64 $GDB_TMP_DIR
 else
   adb_pull_if_needed /system/bin/linker $GDB_TMP_DIR