Android WebView: allow for multiple target architectures.

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.
@@ skipping 261 matching lines @@
 # source tree. This method is called from non_sdk_build_init() and adds to the
 # settings specified there.
 #############################################################################
 webview_build_init() {
   # For the WebView build we always use the NDK and SDK in the Android tree,
   # and we don't touch ANDROID_TOOLCHAIN which is already set by Android.
   export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/8
   export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\
 ${ANDROID_SDK_VERSION}
 
-  # For now, TARGET_ARCH is always ARM in this config.
-  TARGET_ARCH=arm
-
   common_vars_defines
 
   # We need to supply SDK paths relative to the top of the Android tree to make
   # sure the generated Android makefiles are portable, as they will be checked
   # into the Android tree.
   ANDROID_SDK=$(python -c \
       "import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \
       '${ANDROID_BUILD_TOP}')")
   ANDROID_SDK_TOOLS=$(python -c \
       "import os.path; \
@@ skipping 12 matching lines @@
   export GYP_DEFINES="${DEFINES}"
 
   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"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }