Name V8 snapshot according to target architecture (32/64 bit).

android_webview/android_webview_tests.gypi

Index: android_webview/android_webview_tests.gypi
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 817654fd0684070a7b26feba5d325c7f5cf3dcd4..aca7475e5c44c21d6621b11763e3f9063b446b45 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -18,36 +18,34 @@
         'native_lib_target': 'libstandalonelibwebviewchromium',
         'resource_dir': 'test/shell/res',
         'extensions_to_not_compress': 'pak,dat,bin',
+        'asset_location': '<(PRODUCT_DIR)/android_webview_apk/assets',
         'extra_native_libs': ['<(SHARED_LIB_DIR)/libdrawgl.>(android_product_extension)'],
+        'snapshot_copy_files': '<(snapshot_copy_files)',
         'additional_input_paths': [
-          '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video.js',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_inside_div_test.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/multiple_videos_test.html',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/video.mp4',
+          '<(asset_location)/webviewchromium.pak',
+          '<(asset_location)/en-US.pak',
+          '<(asset_location)/asset_file.html',
+          '<(asset_location)/cookie_test.html',
+          '<(asset_location)/asset_icon.png',
+          '<(asset_location)/full_screen_video.js',
+          '<(asset_location)/full_screen_video_test.html',
+          '<(asset_location)/full_screen_video_inside_div_test.html',
+          '<(asset_location)/multiple_videos_test.html',
+          '<(asset_location)/video.mp4',
+          '<@(snapshot_additional_input_paths)',
         ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
             'additional_input_paths': [
-              '<(PRODUCT_DIR)/icudtl.dat',
-            ],
-          }],
-          ['v8_use_external_startup_data==1', {
-            'additional_input_paths': [
-              '<(PRODUCT_DIR)/natives_blob.bin',
-              '<(PRODUCT_DIR)/snapshot_blob.bin',
+              '<(asset_location)/icudtl.dat',
             ],
           }],
         ],
+        'includes': [ 'snapshot_copying.gypi' ],
       },
       'copies': [
         {
-          'destination': '<(PRODUCT_DIR)/android_webview_apk/assets',
+          'destination': '<(asset_location)',
           'files': [
             '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
             '<(PRODUCT_DIR)/android_webview_assets/locales/en-US.pak',
@@ -59,6 +57,7 @@
             '<(java_in_dir)/assets/full_screen_video_inside_div_test.html',
             '<(java_in_dir)/assets/multiple_videos_test.html',
             '<(java_in_dir)/assets/video.mp4',
+            '<@(snapshot_copy_files)',
           ],
           'conditions': [
             ['icu_use_data_file_flag==1', {
@@ -66,12 +65,6 @@
                 '<(PRODUCT_DIR)/icudtl.dat',
               ],
             }],
-            ['v8_use_external_startup_data==1', {
-              'files': [
-                '<(PRODUCT_DIR)/natives_blob.bin',
-                '<(PRODUCT_DIR)/snapshot_blob.bin',
-              ],
-            }],
           ],
         },
       ],