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

third_party/WebKit/Source/web/web_tests.gyp

 #
 # Copyright (C) 2011 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 123 matching lines @@
                 'cflags_cc': ['-Wno-c++0x-compat'],
             },
         }],
         ['OS=="android" and gtest_target_type == "shared_library"', {
             # Wrap libwebkit_unit_tests.so into an android apk for execution.
             'targets': [{
                 'target_name': 'webkit_unit_tests_apk',
                 'type': 'none',
                 'dependencies': [
                     '<(DEPTH)/base/base.gyp:base_java',
-                    '<(DEPTH)/content/content.gyp:content_shell_assets_copy',
+                    '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak',
                     '<(DEPTH)/net/net.gyp:net_java',
                     'webkit_unit_tests',
                 ],
+                'conditions': [
+                  ['v8_use_external_startup_data==1', {
+                    'dependencies': [
+                      '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',
+                      '<(DEPTH)/content/content.gyp:content_v8_external_data',
+                    ],
+                  }],
+                ],
                 'variables': {
                     'test_suite_name': 'webkit_unit_tests',
                     'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',
                     'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
                     'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
                     'conditions': [
                       ['v8_use_external_startup_data==1', {
                         'additional_input_paths': [
-                          '<(PRODUCT_DIR)/content_shell/assets/natives_blob_<(arch_suffix).bin',
-                          '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob_<(arch_suffix).bin',
+                          '<(PRODUCT_DIR)/content_shell/assets/natives_blob.bin',
+                          '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob.bin',
                         ],
                       }],
                     ],
                 },
-                'includes': [
-                  '../../../../build/apk_test.gypi',
-                  '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
-                ],
+                'includes': [ '../../../../build/apk_test.gypi' ],
             }],
         }],
         ['test_isolation_mode != "noop"', {
             'targets': [
                 {
                     'target_name': 'webkit_unit_tests_run',
                     'type': 'none',
                     'dependencies': [
                         'webkit_unit_tests',
                     ],
                     'includes': [
                         '../../../../build/isolate.gypi',
                     ],
                     'sources': [
                         'webkit_unit_tests.isolate',
                     ],
                 },
             ],
         }],
     ],
 }