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

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 1f179ffcbe10fc75023efe9602ff0d803fcc11bc..ef21a0cc94b17a8af43d02668751c95d9ca1a761 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2915,8 +2915,8 @@
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob.bin',
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob.bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suffix).bin',
                 ],
               }],
             ],
@@ -2928,16 +2928,23 @@
               ],
               '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'],
             }],
           ],
-          'includes': [ '../build/apk_test.gypi' ],
+          'includes': [
+            '../build/apk_test.gypi',
+            '../build/android/v8_external_startup_data_arch_suffix.gypi'
+          ],
         },
       ],
       'conditions': [