Reland Reland 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 04ba14e4b7e88aaf6f749698ab992e729c53d1e1..867069da8daa1e7aa9f2add9a18d85aee2fed581 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1878,10 +1878,14 @@
               ],
               'variables': {
                 'dest_path': '<(asset_location)',
-                'src_files': [
+                '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'],
@@ -1894,13 +1898,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',