Reland "Use the internal copy of gvr_shim in unofficial builds if the internal...

Reland "Use the internal copy of gvr_shim in unofficial builds if the internal repository is available."

This change was originally reverted because the included prebuilts
caused crashes in component builds. The prebuilts included with this
change have been updated to fix the component build problem.

Original commit message:
> Use the internal copy of gvr_shim in unofficial builds if the internal repository is available.
>
> Otherwise, link against a new set of gn-built prebuilts.
>
> Bug: 749784
> Change-Id: Id96666125226b3400bb92c31e5c97a7c2a64624d
> Reviewed-on: https://chromium-review.googlesource.com/947577
> Commit-Queue: Peter Collingbourne <pcc@chromium.org>
> Reviewed-by: Brandon Jones <bajones@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#546707}

Bug: 749784
Change-Id: I1c7c8c1dc1f96228c81b43d40148be7a54dfcae2
Reviewed-on: https://chromium-review.googlesource.com/1008618Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550757}

build/config/sanitizers/BUILD.gn

@@ -345,11 +345,6 @@ config("cfi_flags") {
     if (!defined(cfi_blacklist_path)) {
       cfi_blacklist_path =
           rebase_path("//tools/cfi/blacklist.txt", root_build_dir)
-      if (is_android) {
-        cflags +=
-            [ "-fsanitize-blacklist=" +
-              rebase_path("//tools/cfi/blacklist_android.txt", root_build_dir) ]
-      }
     }
     cflags += [
       "-fsanitize=cfi-vcall",

chrome/BUILD.gn

@@ -1838,6 +1838,10 @@ if (is_android) {
         "//ui/events/devices",
       ]
     }
+
+    if (enable_vr) {
+      deps += [ "//third_party/gvr-android-sdk:gvr_shim" ]
+    }
   }
 }
 

chrome/android/BUILD.gn

@@ -815,14 +815,6 @@ template("chrome_shared_library") {
       "//chrome:chrome_android_core",
     ]
 
-    if (enable_vr) {
-      # Ensure libgvr static library appears before gcc library in linking order.
-      # See https://crbug.com/704305 for details.
-      libs = [
-        "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
-      ]
-    }
-
     if (use_order_profiling) {
       deps += [ "//tools/cygprofile" ]
     }
@@ -1033,14 +1025,6 @@ if (!android_64bit_target_cpu ||
       "//chrome:chrome_android_core",
     ]
 
-    if (enable_vr) {
-      # Ensure libgvr static library appears before gcc library in linking order.
-      # See https://crbug.com/704305 for details.
-      libs = [
-        "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
-      ]
-    }
-
     configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
     configs += [ "//build/config/android:hide_all_but_jni" ]
     if (use_lld) {
@@ -1082,12 +1066,6 @@ shared_library("chrome_sync_shell") {
     "//components/sync",
     "//components/sync:test_support_fake_server_android",
   ]
-  if (enable_vr) {
-    # Ensure libgvr static library appears before gcc library in linking order.
-    # See https://crbug.com/704305 for details.
-    libs =
-        [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
-  }
   if (chromium_linker_supported && use_lld) {
     configs += [ "//build/config/android:lld_pack_relocations" ]
   }

chrome/browser/android/vr/BUILD.gn

@@ -63,6 +63,7 @@ static_library("vr_android") {
     "//services/device/public/mojom",
     "//services/metrics/public/cpp:ukm_builders",
     "//services/ui/public/cpp/gpu",
+    "//third_party/gvr-android-sdk:gvr_shim",
     "//ui/android",
     "//ui/base",
     "//ui/display",
@@ -74,10 +75,7 @@ static_library("vr_android") {
     "//device/vr/public/mojom",
   ]
 
-  libs = [
-    "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
-    "android",
-  ]
+  libs = [ "android" ]
 
   configs += [
     "//third_party/gvr-android-keyboard:kb_config",

device/vr/BUILD.gn

@@ -70,11 +70,9 @@ if (enable_vr) {
         "//device/gamepad",
         "//device/gamepad/public/cpp:shared_with_blink",
         "//third_party/blink/public:blink_headers",
+        "//third_party/gvr-android-sdk:gvr_shim",
       ]
       ldflags = [ "-landroid" ]
-      libs = [
-        "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
-      ]
       configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
     }
 

third_party/gvr-android-sdk/BUILD.gn

@@ -97,3 +97,14 @@ android_aar_prebuilt("gvr_controller_java") {
 config("libgvr_config") {
   include_dirs = [ "src/libraries/headers/" ]
 }
+
+source_set("gvr_shim") {
+  if (enable_chrome_android_internal && !is_official_build) {
+    deps = [
+      "//clank/third_party/gvr_shim",
+    ]
+  } else {
+    libs =
+        [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
+  }
+}

third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1

-0c0e4953a48666ab50ad023452d46c91dbe41a66
\ No newline at end of file
+b93dc26168196ca0eb2cb7d294b3c0aab0965083
\ No newline at end of file

third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1

-8bf4445115d2ca01e5d99a4839c94e0f10cc45b4
\ No newline at end of file
+e8ab02f4481e65092cf5c032e036a6fe31c92071
\ No newline at end of file