summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormichaelbai <michaelbai@chromium.org>2015-10-23 11:46:10 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-23 18:49:07 +0000
commited31140dee44c06e6398e92e1afb9c047c9137e6 (patch)
tree2ee30c514695f5ed4e1b45112a897831761870e1 /chrome
parentfc76b7e7f854c3791e683f3c9e81d27d9812be78 (diff)
downloadchromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.zip
chromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.tar.gz
chromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.tar.bz2
Orignal patch
https://codereview.chromium.org/1400953002/ 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 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/1417753004 Cr-Commit-Position: refs/heads/master@{#355843}
Diffstat (limited to 'chrome')
-rw-r--r--chrome/android/BUILD.gn6
-rw-r--r--chrome/chrome_android_paks.gypi21
-rw-r--r--chrome/chrome_tests_unit.gypi15
3 files changed, 28 insertions, 14 deletions
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 7480244..1229c40 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -357,10 +357,8 @@ copy_ex("chrome_public_apk_assets") {
]
if (v8_use_external_startup_data) {
- sources += [
- "$root_out_dir/natives_blob.bin",
- "$root_out_dir/snapshot_blob.bin",
- ]
+ renaming_sources = v8_external_startup_data_renaming_sources
+ renaming_destinations = v8_external_startup_data_renaming_destinations
deps += [ "//v8" ]
}
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi
index 1ebd363..aa32574 100644
--- a/chrome/chrome_android_paks.gypi
+++ b/chrome/chrome_android_paks.gypi
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
+ 'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'],
'variables': {
'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/assets/<(package_name)',
'chrome_android_pak_input_resources': [
@@ -68,13 +69,9 @@
],
}],
['v8_use_external_startup_data==1', {
- 'chrome_android_pak_input_resources': [
- '<(PRODUCT_DIR)/natives_blob.bin',
- '<(PRODUCT_DIR)/snapshot_blob.bin',
- ],
'chrome_android_pak_output_resources': [
- '<(chrome_android_pak_output_folder)/natives_blob.bin',
- '<(chrome_android_pak_output_folder)/snapshot_blob.bin',
+ '<(chrome_android_pak_output_folder)/natives_blob_<(arch_suffix).bin',
+ '<(chrome_android_pak_output_folder)/snapshot_blob_<(arch_suffix).bin',
],
}],
],
@@ -93,6 +90,18 @@
'<@(chrome_android_pak_input_resources)',
],
'clear': 1,
+ 'conditions': [
+ ['v8_use_external_startup_data==1', {
+ 'renaming_sources': [
+ '<(PRODUCT_DIR)/snapshot_blob.bin',
+ '<(PRODUCT_DIR)/natives_blob.bin',
+ ],
+ 'renaming_destinations': [
+ 'snapshot_blob_<(arch_suffix).bin',
+ 'natives_blob_<(arch_suffix).bin',
+ ],
+ }],
+ ],
},
'includes': ['../build/android/copy_ex.gypi'],
},
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 9646a3b..0cf6a44 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2914,8 +2914,8 @@
['v8_use_external_startup_data==1', {
'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
'additional_input_paths': [
- '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob.bin',
- '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob.bin',
+ '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suffix).bin',
+ '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suffix).bin',
],
}],
],
@@ -2927,16 +2927,23 @@
],
'variables': {
'dest_path': '<(asset_location)',
- 'src_files': [
+ 'renaming_sources': [
'<(PRODUCT_DIR)/natives_blob.bin',
'<(PRODUCT_DIR)/snapshot_blob.bin',
],
+ 'renaming_destinations': [
+ 'natives_blob_<(arch_suffix).bin',
+ 'snapshot_blob_<(arch_suffix).bin',
+ ],
'clear': 1,
},
'includes': ['../build/android/copy_ex.gypi'],
}],
],
- 'includes': [ '../build/apk_test.gypi' ],
+ 'includes': [
+ '../build/apk_test.gypi',
+ '../build/android/v8_external_startup_data_arch_suffix.gypi'
+ ],
},
],
'conditions': [