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

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 1446 matching lines @@
         'components_browsertests_pak_input_resources': [
           '<(PRODUCT_DIR)/components_tests_resources.pak',
           '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
         ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
             'components_browsertests_pak_input_resources': [
               '<(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',
           'type': 'none',
           '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'],
         },
         {
           'target_name': 'components_browsertests_manifest',
           'type': 'none',
           'variables': {
             'jinja_inputs': ['test/android/browsertests_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml',
           },
@@ skipping 19 matching lines @@
             'resource_dir': 'test/android/browsertests_apk/res',
             'asset_location': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
             'conditions': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
                   '<(asset_location)/icudtl.dat',
                 ],
               }],
               ['v8_use_external_startup_data==1', {
                 'additional_input_paths': [
-                  '<(asset_location)/natives_blob.bin',
-                  '<(asset_location)/snapshot_blob.bin',
+                  '<(asset_location)/natives_blob_<(arch_suffix).bin',
+                  '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
                 ],
               }],
             ],
           },
           'includes': [ '../build/apk_browsertest.gypi' ],
         },
         {
           'target_name': 'components_unittests_apk',
           'isolate_file': 'components_unittests.isolate',
           'type': 'none',
@@ skipping 265 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }