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

content/content_tests.gypi

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1859 matching lines @@
             'content.gyp:content_java',
             'content_unittests',
           ],
           'conditions': [
             ['v8_use_external_startup_data==1', {
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
               'variables': {
                 'dest_path': '<(asset_location)',
-                'renaming_sources': [
+                'src_files': [
                   '<(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': {
             'test_suite_name': 'content_unittests',
             'isolate_file': 'content_unittests.isolate',
             'conditions': [
               ['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_<(arch_suffix).bin',
-                  '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/content_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': 'content_shell_browsertests_java',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_shell_java',
             '../base/base.gyp:base_java',
             '../testing/android/native_test.gyp:native_test_java',
             '../ui/android/ui_android.gyp:ui_java',
@@ skipping 286 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }