Introduce arm_version to allow building for armv5, v6 or v7.

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 88 matching lines @@
   # shared library, libchromeview.so.  The file is an order list of section
   # names and the library is linked with option
   # --section-ordering-file=<orderfile>. The order file is updated by profiling
   # startup after compiling with the order_profiling=1 GYP_DEFINES flag.
   ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out"
 
   # The following defines will affect ARM code generation of both C/C++ compiler
   # and V8 mksnapshot.
   case "${TARGET_ARCH}" in
     "arm")
-      DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
+      DEFINES+=" arm_neon=0 arm_version=7 arm_thumb=1 arm_fpu=vfpv3-d16"

[Yaron, 2013/04/10 18:01:44]

Rather than just updating this field, I'd prefer that you didn't set
"arm_version" here and move the default value into gyp itself. The less we
depend on envsetup, the better.

[Fredrik Öhrn, 2013/04/10 19:16:10]

OK, I did it this way because the existing defaults in the gyp file where set to
a armv5 build.

I'll change the defaults to match this line and remove it.

       DEFINES+=" arm_neon_optional=1"  # Enable dynamic NEON support.
       DEFINES+=" ${ORDER_DEFINES}"
       DEFINES+=" target_arch=arm"
       ;;
     "x86")
     # TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
       DEFINES+=" use_libffmpeg=0"
 
       host_arch=$(uname -m | sed -e \
         's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/')
@@ skipping 158 matching lines @@
           '${ANDROID_BUILD_TOP}')")
       ;;
     "mac")
       ANDROID_SDK_TOOLS=$(python -c \
           "import os.path; \
           print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \
           '${ANDROID_BUILD_TOP}')")
       ;;
   esac
   DEFINES+=" android_webview_build=1"
+  # The WebView build gets its cpu-specific flags from the Android build system.
+  DEFINES+=" arm_arch= arm_tune= arm_fpu= arm_float_abi= arm_thumb=0"
   # temporary until all uses of android_build_type are gone (crbug.com/184431)
   DEFINES+=" android_build_type=1"
   DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"
   DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_root=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   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"
 }