Use NDK r8b and 64-bit toolchain

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
 
 ################################################################################
 # Check to make sure the toolchain exists for the NDK version.
 ################################################################################
 common_check_toolchain() {
   if [[ ! -d "${ANDROID_TOOLCHAIN}" ]]; then
     echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2
     echo "The NDK version might be wrong." >& 2
     return 1
   fi
 }
 
 ################################################################################
 # Exports environment variables common to both sdk and non-sdk build (e.g. PATH)
 # based on CHROME_SRC and ANDROID_TOOLCHAIN, along with DEFINES for GYP_DEFINES.
 ################################################################################
 common_vars_defines() {
 
   # Set toolchain path according to product architecture.
-  toolchain_arch="arm"
+  toolchain_arch="arm-linux-androideabi"
   if [[ "${TARGET_PRODUCT}" =~ .*x86.* ]]; then
     toolchain_arch="x86"
+    toolchain_dir="linux-x86"
   fi
 
+  toolchain_version="4.6"
   toolchain_target=$(basename \
-    ${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}-*)
+    ${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}-${toolchain_version})
   toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_target}"\
 "/prebuilt/${toolchain_dir}/bin/"
 
   # Set only if not already set.
   # Don't override ANDROID_TOOLCHAIN if set by Android configuration env.
   export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN:-${toolchain_path}}
 
   common_check_toolchain
 
   # Add Android SDK/NDK tools to system path.
@@ skipping 153 matching lines @@
     # Can not build WebView with NDK/SDK because it needs the Android build
     # system and build inside an Android source tree.
     echo "Can not build WebView with NDK/SDK.  Requires android source tree." \
         >& 2
     echo "Try . build/android/envsetup.sh instead." >& 2
     return 1
   fi
 
 }
 
-
 ################################################################################
 # Initializes environment variables for build with android source.  This expects
 # android environment to be set up along with lunch.  To build:
 #  > . build/envsetup.sh
 #  >  lunch <lunch-type>
 #  > . build/android/envsetup.sh
 #  > make
 #############################################################################
 non_sdk_build_init() {
   # We export "TOP" here so that "mmm" can be run to build Java code without
   # having to cd to $ANDROID_BUILD_TOP.
   export TOP="$ANDROID_BUILD_TOP"
 
-  # We export "ANDROID_NDK_ROOT" for building Chromium for Android by NDK.
-  export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/android-ndk-r7
+  # Set "ANDROID_NDK_ROOT" as checked-in version, if it was not set.
+  if [ ! -d "$ANDROID_NDK_ROOT" ] ; then
+    export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
+  fi
+  if [ ! -d "$ANDROID_NDK_ROOT" ] ; then
+    echo "Can not find Android NDK root ${ANDROID_NDK_ROOT}." >& 2
+    return 1
+  fi
 
   # We export "ANDROID_SDK_ROOT" for building Java source with the SDK.
   export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\
 ${ANDROID_SDK_VERSION}
   # Needed by android antfiles when creating apks.
   export ANDROID_SDK_HOME=${ANDROID_SDK_ROOT}
 
+  # Unset ANDROID_TOOLCHAIN, so it could be set to checked-in 64-bit toolchain.
+  # in common_vars_defines
+  unset ANDROID_TOOLCHAIN
+
   common_vars_defines
 
   DEFINES+=" sdk_build=0"
   DEFINES+=" android_product_out=${ANDROID_PRODUCT_OUT}"
 
   if [ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]; then
     webview_build_init
     return
   fi
 
@@ skipping 34 matching lines @@
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   # TODO(torne): This isn't upstream yet. Upstream it or remove this setting.
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
 }