Linking arm and arm64 gvr static shim library

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 738a1b9077ec16c4a86b9d0917a5e7ffafa2229d..3bbbdb2fafaad54224f7924dd07b7a9686ce1d42 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -81,12 +81,9 @@ declare_args() {
 
   # Enable WebVR support by default on Android
   # Still requires command line flag to access API
-  # TODO(bshe): Remove is_component_build once we can statically link gvr
-  # library. Currently gvr library only has a prebuild so file which causes
-  # linking issue for non component build.
-  enable_webvr = is_android && is_component_build &&
-                 (current_cpu == "x86" || current_cpu == "x64" ||
-                  current_cpu == "arm" || current_cpu == "arm64")
+  # TODO(bshe): Enable for other architecture too. Currently we only support arm
+  # and arm64.
+  enable_webvr = is_android && (current_cpu == "arm" || current_cpu == "arm64")

[agrieve, 2016/11/10 19:16:29]

Can we put back is_component_build for now? Otherwise this change has the effect
of turning on webvr for release builds, which I think deserves a separate
commit.

[bshe, 2016/11/10 20:59:25]

Done.
A follow up CL will simply remove the is_component_build I assume. So if there
is
a problem, a revert is easier and less intrusive?

[agrieve, 2016/11/10 21:47:04]

Right.

 }
 
 # Additional dependent variables -----------------------------------------------