Revert of 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 995 matching lines @@
           ],
           'dependencies': [
             '../ui/compositor/compositor.gyp:compositor',
             '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../ui/android/ui_android.gyp:ui_android',
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_v8_external_data',
           ],
         }],
         ['v8_use_external_startup_data==1 and OS!="ios"', {
           'dependencies': [
             '../gin/gin.gyp:gin',
           ],
         }],
       ],
     },
     {
@@ skipping 836 matching lines @@
           'type': 'none',
           'dependencies': [
             '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': [
-                  '<(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': '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 11 matching lines @@
             'jinja_inputs': ['shell/android/browsertests_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/content_browsertests_manifest/AndroidManifest.xml',
           },
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
           # TODO(GN)
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
+            'content.gyp:content_v8_external_data',
             'content_browsertests',
             'content_shell_browsertests_java',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'test_suite_name': 'content_browsertests',
             'isolate_file': 'content_browsertests.isolate',
             'java_in_dir': 'shell/android/browsertests_apk',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/content_browsertests_manifest/AndroidManifest.xml',
@@ skipping 45 matching lines @@
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
           # GN: //content/shell/android:chromium_linker_test_apk
           'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'conditions': [
             ['target_arch != "x64"', {
               'dependencies': [
                 'chromium_android_linker_test',
-                'content.gyp:content_shell_assets_copy',
+                'content.gyp:content_icudata',
                 'content.gyp:content_java',
+                'content.gyp:content_v8_external_data',
                 'content_shell_java',
               ],
               'variables': {
                 'apk_name': 'ChromiumLinkerTest',
                 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chromium_linker_test_manifest/AndroidManifest.xml',
                 'java_in_dir': 'shell/android/linker_test_apk',
                 'resource_dir': 'shell/android/linker_test_apk/res',
                 'native_lib_target': 'libchromium_android_linker_test',
                 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
                 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
@@ skipping 173 matching lines @@
                   'content_shell_test_apk_run.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }