Linking arm and arm64 gvr static shim library

build/config/features.gni

 # Copyright 2014 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.
 
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
 #
 # These flags are effectively global. Your feature flag should go near the
 # code it controls. Most of these items are here now because they control
@@ skipping 63 matching lines @@
   # system).
   use_gconf = is_linux && !is_chromeos && !is_chromecast
 
   use_gio = is_linux && !is_chromeos && !is_chromecast
 
   # Whether or not to use external popup menu.
   use_external_popup_menu = is_android || is_mac
 
   # 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 -----------------------------------------------
 
 # Enable the spell checker.
 enable_spellcheck = !is_ios
 
 # Use the operating system's spellchecker rather than hunspell.
 use_browser_spellchecker = is_android || is_mac
 
@@ skipping 35 matching lines @@
 
 enable_configuration_policy = !is_ios
 
 enable_mac_keystone = is_mac && is_chrome_branded && is_official_build
 #
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
 #
 # See comment at the top.