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

Unified Diff: third_party/android_platform/development/scripts/symbol.py

Issue 404553002: [Android]: Roll NDK to r10b-rc1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/android_platform/development/scripts/symbol.py
diff --git a/third_party/android_platform/development/scripts/symbol.py b/third_party/android_platform/development/scripts/symbol.py
index d1fbaf7d55da88464960ac1f3970c19dc2ccd3c1..df7f2c4b138ee1e6b2570d2f59eceb83e2c16855 100755
--- a/third_party/android_platform/development/scripts/symbol.py
+++ b/third_party/android_platform/development/scripts/symbol.py
@@ -54,17 +54,17 @@ def ToolPath(tool, toolchain_info=None):
toolchain_prefix = "arm-linux-androideabi"
ndk = "ndk"
elif ARCH == "arm64":
- toolchain_source = "aarch64-linux-android-4.8"
+ toolchain_source = "aarch64-linux-android-4.9"
toolchain_prefix = "aarch64-linux-android"
- ndk = "ndk_experimental"
+ ndk = "ndk"
elif ARCH == "x86":
toolchain_source = "x86-4.6"
toolchain_prefix = "i686-android-linux"
ndk = "ndk"
elif ARCH == "x86_64":
- toolchain_source = "x86_64-4.8"
+ toolchain_source = "x86_64-4.9"
toolchain_prefix = "x86_64-linux-android"
- ndk = "ndk_experimental"
+ ndk = "ndk"
elif ARCH == "mips":
toolchain_source = "mipsel-linux-android-4.6"
toolchain_prefix = "mipsel-linux-android"
@@ -95,7 +95,7 @@ def FindToolchain():
## Known toolchains, newer ones in the front.
if ARCH == "arm64":
- gcc_version = "4.8"
+ gcc_version = "4.9"
known_toolchains = [
("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
]
@@ -110,7 +110,7 @@ def FindToolchain():
]
elif ARCH =="x86_64":
known_toolchains = [
- ("x86_64-linux-android-4.8", "x86_64", "x86_64-linux-android")
+ ("x86_64-linux-android-4.9", "x86_64", "x86_64-linux-android")
]
elif ARCH == "mips":
gcc_version = "4.6"
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698