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

Unified Diff: build/android/adb_gdb

Issue 375483003: Change Android toolchain to GCC 4.9. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn fix (bis) Created 6 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 | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')
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 5c5f727a30cd91cfb413445b96b6aab2cf10ffba..07178c2bd300d84d00916e828da9d72037f15c05 100755
--- a/build/android/adb_gdb
+++ b/build/android/adb_gdb
@@ -473,14 +473,11 @@ get_ndk_toolchain_prebuilt () {
local SUBPATH="$3"
local NAME="$(get_arch_toolchain_prefix $ARCH)"
local FILE TARGET
- FILE=$NDK_DIR/toolchains/$NAME-4.8/prebuilt/$SUBPATH
+ FILE=$NDK_DIR/toolchains/$NAME-4.9/prebuilt/$SUBPATH
if [ ! -f "$FILE" ]; then
- FILE=$NDK_DIR/toolchains/$NAME-4.9/prebuilt/$SUBPATH
+ FILE=$NDK_DIR/toolchains/$NAME-4.8/prebuilt/$SUBPATH
if [ ! -f "$FILE" ]; then
- FILE=$NDK_DIR/toolchains/$NAME-4.6/prebuilt/$SUBPATH
- if [ ! -f "$FILE" ]; then
- FILE=
- fi
+ FILE=
fi
fi
echo "$FILE"
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698