Linking arm and arm64 gvr static shim library

device/vr/BUILD.gn

Index: device/vr/BUILD.gn
diff --git a/device/vr/BUILD.gn b/device/vr/BUILD.gn
index 317c8989c25dc8ef1a024fa6a9724ac483252b5a..8c4d44cf17ff82f285e1f5dd5bc44466a0ede678 100644
--- a/device/vr/BUILD.gn
+++ b/device/vr/BUILD.gn
@@ -9,66 +9,69 @@ if (is_android) {
   import("//build/config/android/rules.gni")  # For generate_jni().
 }
 
-component("vr") {
-  output_name = "device_vr"
+if (current_cpu == "arm" || current_cpu == "arm64") {
+  component("vr") {
+    output_name = "device_vr"
 
-  sources = [
-    "vr_client_dispatcher.h",
-    "vr_device.cc",
-    "vr_device.h",
-    "vr_device_manager.cc",
-    "vr_device_manager.h",
-    "vr_device_provider.h",
-    "vr_service_impl.cc",
-    "vr_service_impl.h",
-  ]
+    sources = [
+      "vr_client_dispatcher.h",
+      "vr_device.cc",
+      "vr_device.h",
+      "vr_device_manager.cc",
+      "vr_device_manager.h",
+      "vr_device_provider.h",
+      "vr_service_impl.cc",
+      "vr_service_impl.h",
+    ]
 
-  deps = [
-    ":mojo_bindings",
-    "//base",
-    "//mojo/public/cpp/bindings",
-    "//ui/gfx",
-  ]
+    deps = [
+      ":mojo_bindings",
+      "//base",
+      "//mojo/public/cpp/bindings",
+      "//ui/gfx",
+    ]
 
-  defines = [ "DEVICE_VR_IMPLEMENTATION" ]
+    defines = [ "DEVICE_VR_IMPLEMENTATION" ]
 
-  if (is_android) {
-    sources += [
-      "android/gvr/gvr_delegate.cc",
-      "android/gvr/gvr_delegate.h",
-      "android/gvr/gvr_device.cc",
-      "android/gvr/gvr_device.h",
-      "android/gvr/gvr_device_provider.cc",
-      "android/gvr/gvr_device_provider.h",
-      "android/gvr/gvr_gamepad_data_fetcher.cc",
-      "android/gvr/gvr_gamepad_data_fetcher.h",
-    ]
+    if (is_android) {
+      sources += [
+        "android/gvr/gvr_delegate.cc",
+        "android/gvr/gvr_delegate.h",
+        "android/gvr/gvr_device.cc",
+        "android/gvr/gvr_device.h",
+        "android/gvr/gvr_device_provider.cc",
+        "android/gvr/gvr_device_provider.h",
+        "android/gvr/gvr_gamepad_data_fetcher.cc",
+        "android/gvr/gvr_gamepad_data_fetcher.h",
+      ]
 
-    deps += [
-      "//device/gamepad",
-      "//third_party/WebKit/public:blink_headers",
-      "//third_party/gvr-android-sdk:libgvr",
-    ]
-    configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
+      deps += [
+        "//device/gamepad",
+        "//third_party/WebKit/public:blink_headers",
+      ]
+      ldflags = [ "-landroid" ]
+      libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
+      configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
+    }
   }
-}
 
-static_library("fakes") {
-  testonly = true
+  static_library("fakes") {
+    testonly = true
 
-  sources = [
-    "test/fake_vr_device.cc",
-    "test/fake_vr_device.h",
-    "test/fake_vr_device_provider.cc",
-    "test/fake_vr_device_provider.h",
-  ]
+    sources = [
+      "test/fake_vr_device.cc",
+      "test/fake_vr_device.h",
+      "test/fake_vr_device_provider.cc",
+      "test/fake_vr_device_provider.h",
+    ]
 
-  public_deps = [
-    ":mojo_bindings",
-    ":vr",
-    "//base",
-    "//mojo/public/cpp/bindings",
-  ]
+    public_deps = [
+      ":mojo_bindings",
+      ":vr",
+      "//base",
+      "//mojo/public/cpp/bindings",
+    ]
+  }
 }
 
 mojom("mojo_bindings") {