Linking arm and arm64 gvr static shim library

chrome/browser/android/vr_shell/BUILD.gn

Index: chrome/browser/android/vr_shell/BUILD.gn
diff --git a/chrome/browser/android/vr_shell/BUILD.gn b/chrome/browser/android/vr_shell/BUILD.gn
index c9e16628f94669cc9bf26a00d525c56d02d85627..0b107389838c7c9f1717d09297cbfca7e2510755 100644
--- a/chrome/browser/android/vr_shell/BUILD.gn
+++ b/chrome/browser/android/vr_shell/BUILD.gn
@@ -8,70 +8,73 @@ import("//testing/test.gni")
 
 assert(enable_vr_shell || enable_webvr)
 
-static_library("vr_common") {
-  defines = []
+if (current_cpu == "arm" || current_cpu == "arm64") {
+  static_library("vr_common") {
+    defines = []
 
-  sources = [
-    "animation.cc",
-    "animation.h",
-    "easing.cc",
-    "easing.h",
-    "ui_elements.cc",
-    "ui_elements.h",
-    "ui_interface.cc",
-    "ui_interface.h",
-    "ui_scene.cc",
-    "ui_scene.h",
-    "vr_compositor.cc",
-    "vr_compositor.h",
-    "vr_controller.cc",
-    "vr_controller.h",
-    "vr_gesture.h",
-    "vr_gl_util.cc",
-    "vr_gl_util.h",
-    "vr_input_manager.cc",
-    "vr_input_manager.h",
-    "vr_math.cc",
-    "vr_math.h",
-    "vr_shell.cc",
-    "vr_shell.h",
-    "vr_shell_delegate.cc",
-    "vr_shell_delegate.h",
-    "vr_shell_renderer.cc",
-    "vr_shell_renderer.h",
-    "vr_web_contents_observer.cc",
-    "vr_web_contents_observer.h",
-  ]
+    sources = [
+      "animation.cc",
+      "animation.h",
+      "easing.cc",
+      "easing.h",
+      "ui_elements.cc",
+      "ui_elements.h",
+      "ui_interface.cc",
+      "ui_interface.h",
+      "ui_scene.cc",
+      "ui_scene.h",
+      "vr_compositor.cc",
+      "vr_compositor.h",
+      "vr_controller.cc",
+      "vr_controller.h",
+      "vr_gesture.h",
+      "vr_gl_util.cc",
+      "vr_gl_util.h",
+      "vr_input_manager.cc",
+      "vr_input_manager.h",
+      "vr_math.cc",
+      "vr_math.h",
+      "vr_shell.cc",
+      "vr_shell.h",
+      "vr_shell_delegate.cc",
+      "vr_shell_delegate.h",
+      "vr_shell_renderer.cc",
+      "vr_shell_renderer.h",
+      "vr_web_contents_observer.cc",
+      "vr_web_contents_observer.h",
+    ]
 
-  if (enable_vr_shell_ui_dev) {
-    assert(enable_vr_shell)
-    defines += [ "ENABLE_VR_SHELL_UI_DEV" ]
-  }
+    if (enable_vr_shell_ui_dev) {
+      assert(enable_vr_shell)
+      defines += [ "ENABLE_VR_SHELL_UI_DEV" ]
+    }
 
-  deps = [
-    ":vr_shell_jni_headers",
-    "//base",
-    "//cc",
-    "//content/public/browser",
-    "//content/public/common",
-    "//device/vr",
-    "//third_party/gvr-android-sdk:libgvr",
-    "//ui/android",
-    "//ui/base",
-    "//ui/display",
-    "//ui/gl",
-    "//ui/gl/init",
-  ]
+    deps = [
+      ":vr_shell_jni_headers",
+      "//base",
+      "//cc",
+      "//content/public/browser",
+      "//content/public/common",
+      "//device/vr",
+      "//ui/android",
+      "//ui/base",
+      "//ui/display",
+      "//ui/gl",
+      "//ui/gl/init",
+    ]
 
-  configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
-}
+    libs =
+        [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
+    configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
+  }
 
-generate_jni("vr_shell_jni_headers") {
-  sources = [
-    "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java",
-    "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java",
-  ]
-  jni_package = "vr_shell"
+  generate_jni("vr_shell_jni_headers") {
+    sources = [
+      "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java",
+      "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java",
+    ]
+    jni_package = "vr_shell"
+  }
 }
 
 if (enable_vr_shell) {