Build changes for android on arm

build/config/arm.gni

Index: build/config/arm.gni
diff --git a/build/config/arm.gni b/build/config/arm.gni
index 778ecc10715bf51014ce8fa6a41d765f20ad18d4..08a1ba1c83035bd303462a87ea7f7ce0ac64fd3f 100644
--- a/build/config/arm.gni
+++ b/build/config/arm.gni
@@ -2,7 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-if (current_cpu == "arm") {
+# Some components need arm settings for target_cpu too.

[brettw, 2015/03/16 17:16:36]

I think it would be good to make this more explicit. Something like

This file declares the ARM flags which are accessible when the current toolchain
is building for ARM, or the target toolchain is building for ARM.

+if (current_cpu == "arm" || target_cpu == "arm") {
   declare_args() {
     # Version of the ARM processor when compiling on ARM. Ignored on non-ARM
     # platforms.
@@ -24,7 +25,7 @@ if (current_cpu == "arm") {
     # Whether to enable optional NEON code paths.
     arm_optionally_use_neon = false
 
-    if (is_android) {
+    if (is_android || target_os == "android") {
       arm_use_neon = false
       arm_optionally_use_neon = true
     }