diff options
| author | gsennton <gsennton@chromium.org> | 2015-02-10 02:32:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 10:33:27 +0000 |
| commit | 48f415fdf3ad4eb52066f939455ab324f5381fb6 (patch) | |
| tree | 0c31032603a314c456a109f6ea93cf3490e5e355 /android_webview/apk | |
| parent | 65527cf2bdbf381e4adec05a4e650cd2e2720fe2 (diff) | |
| download | chromium_src-48f415fdf3ad4eb52066f939455ab324f5381fb6.zip chromium_src-48f415fdf3ad4eb52066f939455ab324f5381fb6.tar.gz chromium_src-48f415fdf3ad4eb52066f939455ab324f5381fb6.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/881923003
Cr-Commit-Position: refs/heads/master@{#315533}
Diffstat (limited to 'android_webview/apk')
| -rw-r--r-- | android_webview/apk/system_webview_apk_common.gypi | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi index a8f5b6c..b471352 100644 --- a/android_webview/apk/system_webview_apk_common.gypi +++ b/android_webview/apk/system_webview_apk_common.gypi @@ -18,6 +18,7 @@ 'R_package_relpath': 'com/android/webview/chromium', 'extensions_to_not_compress': 'pak,bin,dat', 'asset_location': '<(INTERMEDIATE_DIR)/assets/', + 'snapshot_copy_files': '<(snapshot_copy_files)', # TODO: crbug.com/442348 Update proguard.flags and re-enable. 'proguard_enabled': 'false', 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'], @@ -26,6 +27,10 @@ '<@(webview_locales_output_paks)', '<(asset_location)/webviewchromium.pak', '<(asset_location)/webview_licenses.notice', + '<@(snapshot_additional_input_paths)', + ], + 'includes': [ + '../snapshot_copying.gypi', ], 'conditions': [ ['icu_use_data_file_flag==1', { @@ -33,12 +38,6 @@ '<(asset_location)/icudtl.dat', ], }], - ['v8_use_external_startup_data==1', { - 'additional_input_paths': [ - '<(asset_location)/natives_blob.bin', - '<(asset_location)/snapshot_blob.bin', - ], - }], ], }, 'copies': [ @@ -47,6 +46,7 @@ 'files': [ '<@(webview_locales_input_paks)', '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak', + '<@(snapshot_copy_files)', ], 'conditions': [ ['icu_use_data_file_flag==1', { @@ -54,12 +54,6 @@ '<(PRODUCT_DIR)/icudtl.dat', ], }], - ['v8_use_external_startup_data==1', { - 'files': [ - '<(PRODUCT_DIR)/natives_blob.bin', - '<(PRODUCT_DIR)/snapshot_blob.bin', - ], - }], ], }, ], |