diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-10-22 16:58:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-22 23:59:52 +0000 |
| commit | 979b03a19f63b1cbe02fa3df99707c3f93f7c9cf (patch) | |
| tree | 6f7185e47abf2c6cf3a054fb5ac0bc270ddc6147 /components/components_tests.gyp | |
| parent | d5ac7d52b323d04178bba9cc746c623438d48751 (diff) | |
| download | chromium_src-979b03a19f63b1cbe02fa3df99707c3f93f7c9cf.zip chromium_src-979b03a19f63b1cbe02fa3df99707c3f93f7c9cf.tar.gz chromium_src-979b03a19f63b1cbe02fa3df99707c3f93f7c9cf.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1400953002
Cr-Commit-Position: refs/heads/master@{#355680}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 4bdb041..c31542f 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1449,12 +1449,6 @@ '<(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', - ], - }], ], }, 'targets': [ @@ -1464,13 +1458,28 @@ 'dependencies': [ 'components_browsertests', ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets', - 'files': [ - '<@(components_browsertests_pak_input_resources)', - ], - } + 'variables': { + 'dest_path': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets', + 'src_files': [ + '<@(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', + '../build/android/v8_external_startup_data_arch_suffix.gypi', ], }, { |