diff options
| author | boliu <boliu@chromium.org> | 2015-02-09 18:19:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 02:20:50 +0000 |
| commit | 9963720b9c6c2e79dbff97d4c16f6b4bac4ab543 (patch) | |
| tree | 91dc7c92e0e24e0b6d65fb8ac2e758bc873ae393 /android_webview/apk | |
| parent | 63643dbe9fd4db0dafaf5055dca59bef904e8431 (diff) | |
| download | chromium_src-9963720b9c6c2e79dbff97d4c16f6b4bac4ab543.zip chromium_src-9963720b9c6c2e79dbff97d4c16f6b4bac4ab543.tar.gz chromium_src-9963720b9c6c2e79dbff97d4c16f6b4bac4ab543.tar.bz2 | |
Revert of Name V8 snapshot according to target architecture (32/64 bit). (patchset #5 id:80001 of https://codereview.chromium.org/903793002/)
Reason for revert:
Some target_arch constants are wrong/missing, causing build breaks on those architectures.
Original issue's description:
> 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
>
> Committed: https://crrev.com/0ae506b5a6eae5cf0e440752a4fb99b35e2b0f05
> Cr-Commit-Position: refs/heads/master@{#315314}
TBR=torne@chromium.org,rmcilroy@chromium.org,mef@chromium.org,kkimlabs@chromium.org,gsennton@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=455699
Review URL: https://codereview.chromium.org/868363003
Cr-Commit-Position: refs/heads/master@{#315475}
Diffstat (limited to 'android_webview/apk')
| -rw-r--r-- | android_webview/apk/system_webview_apk_common.gypi | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi index b471352..a8f5b6c 100644 --- a/android_webview/apk/system_webview_apk_common.gypi +++ b/android_webview/apk/system_webview_apk_common.gypi @@ -18,7 +18,6 @@ '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'], @@ -27,10 +26,6 @@ '<@(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', { @@ -38,6 +33,12 @@ '<(asset_location)/icudtl.dat', ], }], + ['v8_use_external_startup_data==1', { + 'additional_input_paths': [ + '<(asset_location)/natives_blob.bin', + '<(asset_location)/snapshot_blob.bin', + ], + }], ], }, 'copies': [ @@ -46,7 +47,6 @@ 'files': [ '<@(webview_locales_input_paks)', '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak', - '<@(snapshot_copy_files)', ], 'conditions': [ ['icu_use_data_file_flag==1', { @@ -54,6 +54,12 @@ '<(PRODUCT_DIR)/icudtl.dat', ], }], + ['v8_use_external_startup_data==1', { + 'files': [ + '<(PRODUCT_DIR)/natives_blob.bin', + '<(PRODUCT_DIR)/snapshot_blob.bin', + ], + }], ], }, ], |