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

Unified Diff: build/android/adb_gdb

Issue 2193943002: [Android] Roll to NDK r12b. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase: rerun all CQ bots Created 4 years, 3 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 | « DEPS ('k') | build/config/android/BUILD.gn » ('j') | 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 13ce78c13ea0d67abb42d4dfaac96b685d8238f5..8d7d3c6c5f47092a8bb731780022be2bcfed3e66 100755
--- a/build/android/adb_gdb
+++ b/build/android/adb_gdb
@@ -640,6 +640,16 @@ Please verify your NDK installation!"
}
# $1: NDK install path
+get_ndk_host_gdb_client() {
+ local NDK_DIR="$1"
+ local HOST_OS HOST_ARCH
+
+ HOST_OS=$(get_ndk_host_system)
+ HOST_ARCH=$(get_ndk_host_arch)
+ echo "$NDK_DIR/prebuilt/$HOST_OS-$HOST_ARCH/bin/gdb"
+}
+
+# $1: NDK install path
# $2: target architecture.
get_ndk_gdbserver () {
local NDK_DIR="$1"
@@ -678,7 +688,7 @@ ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN%/}
# Find host GDB client binary
if [ -z "$GDB" ]; then
- GDB=$(which $ANDROID_TOOLCHAIN/*-$GDBEXEPOSTFIX 2>/dev/null | head -1)
+ GDB=$(get_ndk_host_gdb_client "$ANDROID_NDK_ROOT")
if [ -z "$GDB" ]; then
panic "Can't find Android gdb client in your path, check your \
--toolchain or --gdb path."
« no previous file with comments | « DEPS ('k') | build/config/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698