Reland Switch Chrome Android using v8 arch specific external data name

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index daf72d834ec7725718b26289a21b44c48613511a..3d65aad1b702f8e312438987454723468409cab3 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_v8_external_data',
+            'content.gyp:content_shell_assets_copy',
           ],
         }],
         ['v8_use_external_startup_data==1 and OS!="ios"', {
@@ -1872,15 +1872,19 @@
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
-              'copies': [
-                {
-                'destination': '<(asset_location)',
-                  'files': [
-                    '<(PRODUCT_DIR)/natives_blob.bin',
-                    '<(PRODUCT_DIR)/snapshot_blob.bin',
-                  ],
-                },
-              ],
+              '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'],
             }],
           ],
           'variables': {
@@ -1890,13 +1894,16 @@
               ['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.bin',
-                  '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob.bin',
+                  '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
                 ],
               }],
             ],
           },
-          'includes': [ '../build/apk_test.gypi' ],
+          'includes': [
+            '../build/apk_test.gypi',
+            '../build/android/v8_external_startup_data_arch_suffix.gypi',
+          ],
         },
         {
           'target_name': 'content_shell_browsertests_java',
@@ -1928,9 +1935,8 @@
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_icudata',
+            'content.gyp:content_shell_assets_copy',
             'content.gyp:content_java',
-            'content.gyp:content_v8_external_data',
             'content_browsertests',
             'content_shell_browsertests_java',
             'content_java_test_support',
@@ -1996,9 +2002,8 @@
             ['target_arch != "x64"', {
               'dependencies': [
                 'chromium_android_linker_test',
-                'content.gyp:content_icudata',
+                'content.gyp:content_shell_assets_copy',
                 'content.gyp:content_java',
-                'content.gyp:content_v8_external_data',
                 'content_shell_java',
               ],
               'variables': {