Reland 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 135 matching lines @@
                     'webkit_unit_tests',
                 ],
                 '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': ['<(asset_location)/content_shell.pak'],
                     'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
                     'conditions': [
                       ['v8_use_external_startup_data==1', {
                         'additional_input_paths': [
-                          '<(asset_location)/natives_blob.bin',
-                          '<(asset_location)/snapshot_blob.bin',
+                          '<(asset_location)/natives_blob_<(arch_suffix).bin',
+                          '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
                         ],
                       }],
                     ],
                 },
-                'includes': [ '../../../../build/apk_test.gypi' ],
+                'includes': [
+                  '../../../../build/apk_test.gypi',
+                  '../../../../build/android/v8_external_startup_data_arch_suffix.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',
                     ],
                 },
             ],
         }],
     ],
 }