Revert of Reland Switch Chrome Android using v8 arch specific external data name (patchset #3 id:40001 of https://codereview.chromium.org/1417753004/ )

Reason for revert:
broke gpu bots: https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/3712

Original issue's description:
> Orignal patch
> https://codereview.chromium.org/1400953002/
>
> Switch Chrome Android using v8 arch specific external data name
>
> For 32-bit, natives_blob_32.bin and snapshot_blob_32.bin are used.
> For 64-bit, natives_blob_64.bin and natives_blob_64.bin are used.
>
> This patch also removed the existing v8 startup data in
> destination directory by using copy_ex to remove directory
> first.
>
> BUG=540788
> TBR=jochen@chromium.org,dpranke@chromium.org,halliwell@chromium.org,jbudorick@chromium.org,mef@chromium.org,rmcilroy@chromium.org,dtrainor@chromium.org,cpu@chromium.org
>
> Committed: https://crrev.com/ed31140dee44c06e6398e92e1afb9c047c9137e6
> Cr-Commit-Position: refs/heads/master@{#355843}

TBR=michaelbai@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=540788

Review URL: https://codereview.chromium.org/1421893002

Cr-Commit-Position: refs/heads/master@{#355877}

16 files changed, 134 insertions, 212 deletions

diff --git a/build/android/v8_external_startup_data_arch_suffix.gypi b/build/android/v8_external_startup_data_arch_suffix.gypi
deleted file mode 100644
index 8adae9e..0000000
--- a/build/android/v8_external_startup_data_arch_suffix.gypi
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2015 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.
-
-{
-  'variables': {
-    'arch_suffix': '<(arch_suffix)',
-    'variables': {
-      'conditions': [
-        ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', {
-          'arch_suffix': '32',
-        }, {
-          'arch_suffix': '64',
-        }],
-      ],
-    }
-  }
-}
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
index f1f27de..ee1b666 100644
--- a/build_overrides/v8.gni
+++ b/build_overrides/v8.gni
@@ -22,21 +22,3 @@ v8_use_external_startup_data = !(is_win || is_ios)
 v8_extra_library_files = []
 v8_experimental_extra_library_files =
     [ "../third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js" ]
-
-if (is_android) {
-  v8_external_startup_data_renaming_sources = [
-    "$root_out_dir/natives_blob.bin",
-    "$root_out_dir/snapshot_blob.bin",
-  ]
-  if (current_cpu == "arm" || current_cpu == "x86" || current_cpu == "mipsel") {
-    v8_external_startup_data_renaming_destinations = [
-      "natives_blob_32.bin",
-      "snapshot_blob_32.bin",
-    ]
-  } else {
-    v8_external_startup_data_renaming_destinations = [
-      "natives_blob_64.bin",
-      "snapshot_blob_64.bin",
-    ]
-  }
-}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 1229c40..7480244 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -357,8 +357,10 @@ copy_ex("chrome_public_apk_assets") {
   ]
 
   if (v8_use_external_startup_data) {
-    renaming_sources = v8_external_startup_data_renaming_sources
-    renaming_destinations = v8_external_startup_data_renaming_destinations
+    sources += [
+      "$root_out_dir/natives_blob.bin",
+      "$root_out_dir/snapshot_blob.bin",
+    ]
     deps += [ "//v8" ]
   }
 
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi
index aa32574..1ebd363 100644
--- a/chrome/chrome_android_paks.gypi
+++ b/chrome/chrome_android_paks.gypi
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'],
   'variables': {
     'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/assets/<(package_name)',
     'chrome_android_pak_input_resources': [
@@ -69,9 +68,13 @@
         ],
       }],
       ['v8_use_external_startup_data==1', {
+        'chrome_android_pak_input_resources': [
+          '<(PRODUCT_DIR)/natives_blob.bin',
+          '<(PRODUCT_DIR)/snapshot_blob.bin',
+        ],
         'chrome_android_pak_output_resources': [
-          '<(chrome_android_pak_output_folder)/natives_blob_<(arch_suffix).bin',
-          '<(chrome_android_pak_output_folder)/snapshot_blob_<(arch_suffix).bin',
+          '<(chrome_android_pak_output_folder)/natives_blob.bin',
+          '<(chrome_android_pak_output_folder)/snapshot_blob.bin',
         ],
       }],
     ],
@@ -90,18 +93,6 @@
           '<@(chrome_android_pak_input_resources)',
         ],
         'clear': 1,
-        'conditions': [
-          ['v8_use_external_startup_data==1', {
-             'renaming_sources': [
-               '<(PRODUCT_DIR)/snapshot_blob.bin',
-               '<(PRODUCT_DIR)/natives_blob.bin',
-             ],
-             'renaming_destinations': [
-               'snapshot_blob_<(arch_suffix).bin',
-               'natives_blob_<(arch_suffix).bin',
-             ],
-          }],
-        ],
       },
       'includes': ['../build/android/copy_ex.gypi'],
     },
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0cf6a44..9646a3b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2914,8 +2914,8 @@
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suffix).bin',
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob.bin',
                 ],
               }],
             ],
@@ -2927,23 +2927,16 @@
               ],
               'variables': {
                 'dest_path': '<(asset_location)',
-                'renaming_sources': [
+                'src_files': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
                 'clear': 1,
               },
               'includes': ['../build/android/copy_ex.gypi'],
             }],
           ],
-          'includes': [
-            '../build/apk_test.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi'
-          ],
+          'includes': [ '../build/apk_test.gypi' ],
         },
       ],
       'conditions': [
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 4f57684..e71e25c 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -546,25 +546,14 @@
             '../third_party/icu/icu.gyp:icudata',
             '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
           ],
-          'variables': {
-            'dest_path': '<(PRODUCT_DIR)/assets',
-            'src_files': [
+          'copies': [{
+            'destination': '<(PRODUCT_DIR)/assets',
+            'files': [
               '<(PRODUCT_DIR)/icudtl.dat',
-            ],
-            'renaming_sources': [
               '<(PRODUCT_DIR)/natives_blob.bin',
               '<(PRODUCT_DIR)/snapshot_blob.bin',
             ],
-            'renaming_destinations': [
-              'natives_blob_<(arch_suffix).bin',
-              'snapshot_blob_<(arch_suffix).bin',
-            ],
-            'clear': 1,
-          },
-          'includes': [
-            '../build/android/copy_ex.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
-          ],
+          }],
         },
         {
           'target_name': 'libcast_shell_android',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 6d0bbd3..de0efea 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1449,6 +1449,12 @@
               '<(PRODUCT_DIR)/icudtl.dat',
             ],
           }],
+          ['v8_use_external_startup_data==1', {
+            'components_browsertests_pak_input_resources': [
+              '<(PRODUCT_DIR)/natives_blob.bin',
+              '<(PRODUCT_DIR)/snapshot_blob.bin',
+            ],
+          }],
         ],
       },
       'targets': [
@@ -1458,28 +1464,13 @@
           'dependencies': [
             'components_browsertests',
           ],
-          'variables': {
-            'dest_path': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
-            'src_files': [
-              '<@(components_browsertests_pak_input_resources)',
-            ],
-            'clear': 1,
-            'conditions': [
-              ['v8_use_external_startup_data==1', {
-                'renaming_sources': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
-              }],
-            ],
-          },
-          'includes': [
-            '../build/android/copy_ex.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
+              'files': [
+                '<@(components_browsertests_pak_input_resources)',
+              ],
+            }
           ],
         },
         {
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index b218724..974ac6a 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -302,9 +302,9 @@ if (is_android) {
     sources = [
       "$root_build_dir/html_viewer.pak",
       "$root_build_dir/icudtl.dat",
+      "$root_out_dir/natives_blob.bin",
+      "$root_out_dir/snapshot_blob.bin",
     ]
-    renaming_sources = v8_external_startup_data_renaming_sources
-    renaming_destinations = v8_external_startup_data_renaming_destinations
   }
 
   generate_mojo_shell_assets_list("build_unittest_assets") {
diff --git a/content/content.gyp b/content/content.gyp
index f1a2a97..b90477e 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -630,34 +630,36 @@
           ],
         },
         {
-          'target_name': 'content_shell_assets_copy',
+          'target_name': 'content_icudata',
           'type': 'none',
-          'dependencies': ['content_shell_and_tests.gyp:content_shell_pak'],
-          'variables': {
-            'src_files': ['<(PRODUCT_DIR)/content_shell.pak'],
-            'conditions': [
-              ['v8_use_external_startup_data==1', {
-                'dependencies': ['<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot'],
-                'renaming_sources': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
-              }],
-              ['icu_use_data_file_flag==1', {
-                'dependencies': ['<(DEPTH)/third_party/icu/icu.gyp:icudata'],
-                'src_files': ['<(PRODUCT_DIR)/icudtl.dat'],
-              }],
-            ],
-            'dest_path': '<(PRODUCT_DIR)/content_shell/assets',
-            'clear': 1,
-          },
-          'includes': [
-            '../build/android/copy_ex.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/content_shell/assets',
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                },
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'content_v8_external_data',
+          'type': 'none',
+          'conditions': [
+            ['v8_use_external_startup_data==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/content_shell/assets',
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                },
+              ],
+            }],
           ],
         },
       ],
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index a514707..e170e34 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -403,6 +403,16 @@
             'browser/devtools/devtools_resources.gyp:devtools_resources',
           ],
         }],
+        ['OS=="android"', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'
+              ],
+            },
+          ],
+        }],
         ['toolkit_views==1', {
           'dependencies': [
             '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources'
@@ -427,7 +437,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
             ],
-            'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
             'conditions': [
               ['toolkit_views==1', {
                 'pak_inputs': [
@@ -436,6 +445,9 @@
               }],
               ['OS!="android"', {
                 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',],
+                'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
+              }, {
+                'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
               }],
             ],
           },
@@ -908,8 +920,9 @@
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
+            'content.gyp:content_v8_external_data',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f715581..3f62e90 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1015,7 +1015,7 @@
           'dependencies': [
             '../ui/android/ui_android.gyp:ui_android',
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_v8_external_data',
           ],
         }],
         ['v8_use_external_startup_data==1 and OS!="ios"', {
@@ -1871,19 +1871,15 @@
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
-              'variables': {
-                'dest_path': '<(asset_location)',
-                'renaming_sources': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
-                'clear': 1,
-              },
-              'includes': ['../build/android/copy_ex.gypi'],
+              'copies': [
+                {
+                'destination': '<(asset_location)',
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                },
+              ],
             }],
           ],
           'variables': {
@@ -1893,16 +1889,13 @@
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/content_unittests_apk/assets',
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
-                  '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob.bin',
                 ],
               }],
             ],
           },
-          'includes': [
-            '../build/apk_test.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
-          ],
+          'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'content_shell_browsertests_java',
@@ -1934,8 +1927,9 @@
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
+            'content.gyp:content_v8_external_data',
             'content_browsertests',
             'content_shell_browsertests_java',
             'content_java_test_support',
@@ -2001,8 +1995,9 @@
             ['target_arch != "x64"', {
               'dependencies': [
                 'chromium_android_linker_test',
-                'content.gyp:content_shell_assets_copy',
+                'content.gyp:content_icudata',
                 'content.gyp:content_java',
+                'content.gyp:content_v8_external_data',
                 'content_shell_java',
               ],
               'variables': {
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 94e0d9f..4fd3e85 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -102,8 +102,10 @@ copy_ex("copy_content_shell_assets") {
     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_out_dir/natives_blob.bin",
+      "$root_out_dir/snapshot_blob.bin",
+    ]
     deps += [ "//v8" ]
   }
 }
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 8bcc78d..810225c 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -53,19 +53,8 @@ base::PlatformFile g_snapshot_pf = kInvalidPlatformFile;
 base::MemoryMappedFile::Region g_natives_region;
 base::MemoryMappedFile::Region g_snapshot_region;
 
-#if defined(OS_ANDROID)
-#ifdef __LP64__
-const char kNativesFileName[] = "natives_blob_64.bin";
-const char kSnapshotFileName[] = "snapshot_blob_64.bin";
-#else
-const char kNativesFileName[] = "natives_blob_32.bin";
-const char kSnapshotFileName[] = "snapshot_blob_32.bin";
-#endif // __LP64__
-
-#else  // defined(OS_ANDROID)
 const char kNativesFileName[] = "natives_blob.bin";
 const char kSnapshotFileName[] = "snapshot_blob.bin";
-#endif  // defined(OS_ANDROID)
 
 void GetV8FilePath(const char* file_name, base::FilePath* path_out) {
 #if !defined(OS_MACOSX)
diff --git a/net/net.gyp b/net/net.gyp
index d5193f6..f24751f 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1520,19 +1520,15 @@
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
-              'variables': {
-                'dest_path': '<(asset_location)',
-                'renaming_sources': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
-                'clear': 1,
-              },
-              'includes': ['../build/android/copy_ex.gypi'],
+              'copies': [
+                {
+                'destination': '<(asset_location)',
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                },
+              ],
             }],
           ],
           'variables': {
@@ -1544,16 +1540,13 @@
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
-                  '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
                 ],
               }],
             ],
           },
-          'includes': [
-            '../build/apk_test.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
-          ],
+          'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'net_junit_tests',
diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index ee8e54d..849b2f3 100644
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -144,19 +144,15 @@
             'dependencies': [
               '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',
             ],
-            'variables': {
-              'dest_path': '<(asset_location)',
-              'renaming_sources': [
-                '<(PRODUCT_DIR)/natives_blob.bin',
-                '<(PRODUCT_DIR)/snapshot_blob.bin',
-              ],
-              'renaming_destinations': [
-                'natives_blob_<(arch_suffix).bin',
-                'snapshot_blob_<(arch_suffix).bin',
-              ],
-              'clear': 1,
-            },
-            'includes': ['../../../../build/android/copy_ex.gypi'],
+            'copies': [
+              {
+              'destination': '<(asset_location)',
+                'files': [
+                  '<(PRODUCT_DIR)/natives_blob.bin',
+                  '<(PRODUCT_DIR)/snapshot_blob.bin',
+                ],
+              },
+            ],
           }],
         ],
         'variables': {
@@ -165,16 +161,13 @@
             ['v8_use_external_startup_data==1', {
               'asset_location': '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets',
               'additional_input_paths': [
-                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
-                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob.bin',
+                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob.bin',
               ],
             }],
           ],
         },
-        'includes': [
-          '../../../../build/apk_test.gypi',
-          '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
-        ],
+        'includes': [ '../../../../build/apk_test.gypi' ],
       },
       {
         'target_name': 'blink_platform_unittests_apk',
diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp
index 9a29480..b4277c8 100644
--- a/third_party/WebKit/Source/web/web_tests.gyp
+++ b/third_party/WebKit/Source/web/web_tests.gyp
@@ -141,10 +141,18 @@
                 'type': 'none',
                 'dependencies': [
                     '<(DEPTH)/base/base.gyp:base_java',
-                    '<(DEPTH)/content/content.gyp:content_shell_assets_copy',
+                    '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak',
                     '<(DEPTH)/net/net.gyp:net_java',
                     'webkit_unit_tests',
                 ],
+                'conditions': [
+                  ['v8_use_external_startup_data==1', {
+                    'dependencies': [
+                      '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',
+                      '<(DEPTH)/content/content.gyp:content_v8_external_data',
+                    ],
+                  }],
+                ],
                 'variables': {
                     'test_suite_name': 'webkit_unit_tests',
                     'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',
@@ -153,16 +161,13 @@
                     'conditions': [
                       ['v8_use_external_startup_data==1', {
                         'additional_input_paths': [
-                          '<(PRODUCT_DIR)/content_shell/assets/natives_blob_<(arch_suffix).bin',
-                          '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob_<(arch_suffix).bin',
+                          '<(PRODUCT_DIR)/content_shell/assets/natives_blob.bin',
+                          '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob.bin',
                         ],
                       }],
                     ],
                 },
-                'includes': [
-                  '../../../../build/apk_test.gypi',
-                  '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
-                ],
+                'includes': [ '../../../../build/apk_test.gypi' ],
             }],
         }],
         ['test_isolation_mode != "noop"', {