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 849b2f35a508e52d6ca7e951c9b70d95291db145..ee8e54d7e4f2a6a8f54b5b71a442310d78dc4bbb 100644
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -144,15 +144,19 @@
             'dependencies': [
               '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',
             ],
-            'copies': [
-              {
-              'destination': '<(asset_location)',
-                'files': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-              },
-            ],
+            'variables': {
+              'dest_path': '<(asset_location)',
+              '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'],
           }],
         ],
         'variables': {
@@ -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',