Revert of 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 a1b6d0a127ad6a0c021ce03a9ff8cf4e516fb000..deef8dca75b771b8fa4c4c6ece6a0c87cfcb840d 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1436,6 +1436,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': [
@@ -1445,28 +1451,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)',
+              ],
+            }
           ],
         },
         {