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

third_party/WebKit/Source/platform/blink_platform_tests.gyp

Index: third_party/WebKit/Source/platform/blink_platform_tests.gyp
diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index dc7e33391e2334e3f50c7b59db64d7b08ca4090f..ee8e54d7e4f2a6a8f54b5b71a442310d78dc4bbb 100644
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -146,10 +146,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'],
@@ -161,13 +165,16 @@
             ['v8_use_external_startup_data==1', {
               'asset_location': '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets',
               'additional_input_paths': [
-                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob.bin',
-                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob.bin',
+                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
+                '<(PRODUCT_DIR)/blink_heap_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': 'blink_platform_unittests_apk',