Revert of Switch Chrome Android using v8 arch specific external data name

content/shell/android/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 84 matching lines @@
   ]
   deps = [
     "//content/shell:pak",
   ]
 
   if (icu_use_data_file) {
     sources += [ "$root_build_dir/icudtl.dat" ]
     deps += [ "//third_party/icu:icudata" ]
   }
   if (v8_use_external_startup_data) {
-    renaming_sources = v8_external_startup_data_renaming_sources
-    renaming_destinations = v8_external_startup_data_renaming_destinations
+    sources += [
+      "$root_build_dir/natives_blob.bin",
+      "$root_build_dir/snapshot_blob.bin",
+    ]
     deps += [ "//v8" ]
   }
 }
 
 android_apk("content_shell_apk") {
   testonly = true
   data_deps = [
     # "//tools/android/forwarder",
   ]
   deps = [
@@ skipping 33 matching lines @@
   ]
   DEPRECATED_java_in_dir = "javatests/src"
 }
 
 instrumentation_test_apk("content_shell_test_apk") {
   deps = [
     "//content/public/android:content_javatests",
     "//base:base_javatests",
     "//net/android:net_javatests",
   ]
-  data_deps = [
-    ":content_shell_apk",
-  ]
+  data_deps = [ ":content_shell_apk" ]
   apk_under_test = ":content_shell_apk"
   apk_name = "ContentShellTest"
   android_manifest = "javatests/AndroidManifest.xml"
   isolate_file = "../../content_shell_test_apk.isolate"
 }
 
 if (current_cpu != "x64") {
   chromium_linker_test_manifest =
       "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
 
@@ skipping 56 matching lines @@
 
   # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
   generate_jni("linker_test_jni_headers") {
     testonly = true
     jni_package = "content/shell"
     sources = [
       "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java",
     ]
   }
 }