Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: build/android/adb_gdb

Issue 279353002: [Android]: Add arm64 and x86_64 support to adb_gdb script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/adb_gdb
diff --git a/build/android/adb_gdb b/build/android/adb_gdb
index a5e49187dbb5840f3b0349288e331d1c69e10ec5..16f875c072664582ec4aa91e439496f63db6568f 100755
--- a/build/android/adb_gdb
+++ b/build/android/adb_gdb
@@ -361,7 +361,7 @@ get_gyp_target_arch () {
cut -d= -f2)
case $ARCH in
ia32|i?86|x86) echo "x86";;
- mips|arm) echo "$ARCH";;
+ mips|arm|arm64|x86_64) echo "$ARCH";;
*) echo "";
esac
}
@@ -429,9 +429,15 @@ get_arch_gnu_config () {
arm)
echo "arm-linux-androideabi"
;;
+ arm64)
+ echo "aarch64-linux-android"
+ ;;
x86)
echo "i686-linux-android"
;;
+ x86_64)
+ echo "x86_64-linux-android"
+ ;;
mips)
echo "mipsel-linux-android"
;;
@@ -468,9 +474,12 @@ get_ndk_toolchain_prebuilt () {
local FILE TARGET
FILE=$NDK_DIR/toolchains/$NAME-4.6/prebuilt/$SUBPATH
if [ ! -f "$FILE" ]; then
- FILE=$NDK_DIR/toolchains/$NAME-4.4.3/prebuilt/$SUBPATH
+ FILE=$NDK_DIR/toolchains/$NAME-4.8/prebuilt/$SUBPATH
if [ ! -f "$FILE" ]; then
- FILE=
+ FILE=$NDK_DIR/toolchains/$NAME-4.4.3/prebuilt/$SUBPATH
+ if [ ! -f "$FILE" ]; then
+ FILE=
+ fi
fi
fi
echo "$FILE"
@@ -904,9 +913,15 @@ PORT=5039
HOST_PORT=$PORT
TARGET_PORT=$PORT
+# Select correct app_process for architecture.
+case $TARGET_ARCH in
+ arm|x86|mips) GDBEXEC=app_process;;
+ arm64|x86_64) GDBEXEC=app_process64;;
+ *) fail_panic "Unknown app_process for architecture!";;
+esac
+
# Detect AddressSanitizer setup on the device. In that case app_process is a
# script, and the real executable is app_process.real.
-GDBEXEC=app_process
GDBEXEC_ASAN=app_process.real
adb_shell ls /system/bin/$GDBEXEC_ASAN
if [ $? == 0 ]; then
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698