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

third_party/WebKit/Source/platform/blink_platform_tests.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 126 matching lines @@
         'dependencies': [
           '<(DEPTH)/base/base.gyp:base_java',
           '<(DEPTH)/net/net.gyp:net_java',
           'blink_heap_unittests',
         ],
         'conditions': [
           ['v8_use_external_startup_data==1', {
             'dependencies': [
               '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',
             ],
-            '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'],
+            'copies': [
+              {
+              'destination': '<(asset_location)',
+                'files': [
+                  '<(PRODUCT_DIR)/natives_blob.bin',
+                  '<(PRODUCT_DIR)/snapshot_blob.bin',
+                ],
+              },
+            ],
           }],
         ],
         'variables': {
           'test_suite_name': 'blink_heap_unittests',
           'conditions': [
             ['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_<(arch_suffix).bin',
-                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob.bin',
+                '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob.bin',
               ],
             }],
           ],
         },
-        'includes': [
-          '../../../../build/apk_test.gypi',
-          '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
-        ],
+        'includes': [ '../../../../build/apk_test.gypi' ],
       },
       {
         'target_name': 'blink_platform_unittests_apk',
         'type': 'none',
         'dependencies': [
           '<(DEPTH)/base/base.gyp:base_java',
           '<(DEPTH)/net/net.gyp:net_java',
           'blink_platform_unittests',
         ],
         'variables': {
@@ skipping 27 matching lines @@
             '../../../../build/isolate.gypi',
           ],
           'sources': [
             'blink_platform_unittests.isolate',
           ],
         }
       ],
     }],
   ],
 }