diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-11-03 11:48:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 19:48:53 +0000 |
| commit | 01630673ae102e70913ac6832fa994c50a1514b5 (patch) | |
| tree | fa5b7c3ae16c52ca7459426741a6fef394c6b1a2 /components/components_tests.gyp | |
| parent | 9a19977117ad2ed2e940962905fc5ea5467df93f (diff) | |
| download | chromium_src-01630673ae102e70913ac6832fa994c50a1514b5.zip chromium_src-01630673ae102e70913ac6832fa994c50a1514b5.tar.gz chromium_src-01630673ae102e70913ac6832fa994c50a1514b5.tar.bz2 | |
Reland Reland Reland Switch Chrome Android using v8 arch specific external data name
This patch changed all android GN target which use v8 snapshot files
as of it being prepared.
origin patch
https://codereview.chromium.org/1422793004/
This patch also fix package_resource.py issue that asset's
renaming didn't trigger the packaging.
origin patch
https://codereview.chromium.org/1417753004/
Switch Chrome Android using v8 arch specific external data name
For 32-bit, natives_blob_32.bin and snapshot_blob_32.bin are used.
For 64-bit, natives_blob_64.bin and natives_blob_64.bin are used.
This patch also removed the existing v8 startup data in
destination directory by using copy_ex to remove directory
first.
BUG=540788, 547235
TBR=jochen@chromium.org,dpranke@chromium.org,halliwell@chromium.org,jbudorick@chromium.org,mef@chromium.org,rmcilroy@chromium.org,dtrainor@chromium.org,cpu@chromium.org
Review URL: https://codereview.chromium.org/1411283009
Cr-Commit-Position: refs/heads/master@{#357577}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index a546f44..5c1e9d1 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1465,14 +1465,9 @@ '<(PRODUCT_DIR)/icudtl.dat', ], }], - ['v8_use_external_startup_data==1', { - 'components_browsertests_pak_input_resources': [ - '<(PRODUCT_DIR)/natives_blob.bin', - '<(PRODUCT_DIR)/snapshot_blob.bin', - ], - }], ], }, + 'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'], 'targets': [ { 'target_name': 'components_browsertests_paks_copy', @@ -1486,6 +1481,18 @@ '<@(components_browsertests_pak_input_resources)', ], 'clear': 1, + 'conditions': [ + ['v8_use_external_startup_data==1', { + 'renaming_sources': [ + '<(PRODUCT_DIR)/natives_blob.bin', + '<(PRODUCT_DIR)/snapshot_blob.bin', + ], + 'renaming_destinations': [ + 'natives_blob_<(arch_suffix).bin', + 'snapshot_blob_<(arch_suffix).bin', + ], + }], + ], }, 'includes': ['../build/android/copy_ex.gypi'], }, @@ -1525,8 +1532,8 @@ }], ['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', ], }], ], |