From 84b50a58248a0a205c75c2f57b2b33aa2af2aa00 Mon Sep 17 00:00:00 2001
From: "rmcilroy@chromium.org"
 <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 17 Jul 2014 23:45:37 +0000
Subject: [PATCH] [Android]: Roll NDK to r10b-rc1.

This roll updates the arm64 and x86_64 ABIS to include changes in NDK r10b-rc1.
This also removes android_tools/ndk_experimental and moves all 64 bit targets
over to using android_tools/ndk instead.

BUG=393903

Review URL: https://codereview.chromium.org/404553002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283926 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                                              |  2 +-
 build/common.gypi                                 | 15 ++++++---------
 .../development/scripts/symbol.py                 | 12 ++++++------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/DEPS b/DEPS
index 778f02656095..b50317e41230 100644
--- a/DEPS
+++ b/DEPS
@@ -512,7 +512,7 @@ deps_os = {
   "android": {
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
-      "@b36620e3a51939055ba871022123221a37ecdebb",
+      "@e91e44dc29517115794a72eea554616d067925ae",
 
     "src/third_party/aosp":
       "/trunk/deps/third_party/aosp@148330",
diff --git a/build/common.gypi b/build/common.gypi
index ec9977b8240a..7920341b9854 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1623,7 +1623,6 @@
             # they're passed to ant which uses a different relative path from
             # gyp.
             'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
-            'android_ndk_experimental_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk_experimental/',
             'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/',
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
@@ -1655,11 +1654,10 @@
             }],
             ['target_arch == "x64"', {
               'android_app_abi%': 'x86_64',
-              'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/arch-x86_64',
+              'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-x86_64',
               'android_ndk_lib_dir%': 'usr/lib64',
-              'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
             ['target_arch=="arm"', {
               'conditions': [
@@ -1676,11 +1674,10 @@
             }],
             ['target_arch == "arm64"', {
               'android_app_abi%': 'arm64-v8a',
-              'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-arm64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/arch-arm64',
+              'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver/gdbserver',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-arm64',
               'android_ndk_lib_dir%': 'usr/lib',
-              'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',
+              'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
             ['target_arch == "mipsel"', {
               'android_app_abi%': 'mips',
diff --git a/third_party/android_platform/development/scripts/symbol.py b/third_party/android_platform/development/scripts/symbol.py
index d1fbaf7d55da..df7f2c4b138e 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"