diff options
| author | gsennton <gsennton@chromium.org> | 2015-02-09 08:11:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 16:12:19 +0000 |
| commit | 0ae506b5a6eae5cf0e440752a4fb99b35e2b0f05 (patch) | |
| tree | 8281de417ba8a49fa47f6e1febfe8f7b657ca9a3 /android_webview/android_webview_tests.gypi | |
| parent | 283a060887c0ed8925a79215cb916cf02c9901c8 (diff) | |
| download | chromium_src-0ae506b5a6eae5cf0e440752a4fb99b35e2b0f05.zip chromium_src-0ae506b5a6eae5cf0e440752a4fb99b35e2b0f05.tar.gz chromium_src-0ae506b5a6eae5cf0e440752a4fb99b35e2b0f05.tar.bz2 | |
Name V8 snapshot according to target architecture (32/64 bit).
Renaming webview copy of V8 snapshot to be able to differentiate
between snapshots for 32- and 64 bit architectures.
This is done so that snapshots for different architectures can be
repacked into the same APK.
BUG=455699
Review URL: https://codereview.chromium.org/903793002
Cr-Commit-Position: refs/heads/master@{#315314}
Diffstat (limited to 'android_webview/android_webview_tests.gypi')
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index 817654f..aca7475 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', - ], - }], ], }, ], |