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

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 3c7e58f6def5b4483f677bf1a3139fb45a5c7630..f1f1a0a60b2bed0f13e20d6b7c50b8924f9f2ae4 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -106,7 +106,7 @@ common_vars_defines() {
   # 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"
@@ -285,6 +285,8 @@ ${ANDROID_SDK_VERSION}
       ;;
   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)"