Reland Reland Switch Chrome Android using v8 arch specific external data name

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index de0efea9205baca91cdb4c87dbd1bd0a6f8107c4..5bba0c735d895718209757468850f6581b99bb78 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1449,14 +1449,9 @@
               '<(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',
-            ],
-          }],
         ],
       },
+      'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'],
       'targets': [
         {
           'target_name': 'components_browsertests_paks_copy',
@@ -1464,14 +1459,26 @@
           'dependencies': [
             'components_browsertests',
           ],
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
-              'files': [
-                '<@(components_browsertests_pak_input_resources)',
-              ],
-            }
-          ],
+          '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'],
         },
         {
           'target_name': 'components_browsertests_manifest',
@@ -1504,13 +1511,13 @@
             'conditions': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/icudtl.dat',
+                  '<(asset_location)/icudtl.dat',
                 ],
               }],
               ['v8_use_external_startup_data==1', {
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  '<(asset_location)/natives_blob_<(arch_suffix).bin',
+                  '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
                 ],
               }],
             ],