Skip to content

Commit

Permalink
Revert of Switch Chrome Android using v8 arch specific external data …
Browse files Browse the repository at this point in the history 
…name (patchset chromium#5 id:80001 of https://codereview.chromium.org/1400953002/ )

Reason for revert:
Looks to have broken various Android Mojo tests:

http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=31621
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=31622

Original issue's description:
> 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
>
> Committed: https://crrev.com/979b03a19f63b1cbe02fa3df99707c3f93f7c9cf
> Cr-Commit-Position: refs/heads/master@{#355680}

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,jam@chromium.org,michaelbai@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=540788

Review URL: https://codereview.chromium.org/1419673008

Cr-Commit-Position: refs/heads/master@{#355697}
  • Loading branch information
@dalecurtis
dalecurtis authored and Commit bot committed Oct 23, 2015
1 parent 0232219 commit c2574ed
Show file tree
Hide file tree
Showing 15 changed files with 133 additions and 213 deletions.
18 changes: 0 additions & 18 deletions build/android/v8_external_startup_data_arch_suffix.gypi
View file

This file was deleted.

18 changes: 0 additions & 18 deletions build_overrides/v8.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,3 @@ v8_use_external_startup_data = !(is_win || is_ios)
v8_extra_library_files = []
v8_experimental_extra_library_files =
[ "../third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js" ]

if (is_android) {
v8_external_startup_data_renaming_sources = [
"$root_build_dir/natives_blob.bin",
"$root_build_dir/snapshot_blob.bin",
]
if (current_cpu == "arm" || current_cpu == "x86" || current_cpu == "mipsel") {
v8_external_startup_data_renaming_destinations = [
"natives_blob_32.bin",
"snapshot_blob_32.bin",
]
} else {
v8_external_startup_data_renaming_destinations = [
"natives_blob_64.bin",
"snapshot_blob_64.bin",
]
}
}
6 changes: 4 additions & 2 deletions chrome/android/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,10 @@ copy_ex("chrome_public_apk_assets") {
]

if (v8_use_external_startup_data) {
renaming_sources = v8_external_startup_data_renaming_sources
renaming_destinations = v8_external_startup_data_renaming_destinations
sources += [
"$root_build_dir/natives_blob.bin",
"$root_build_dir/snapshot_blob.bin",
]
deps += [ "//v8" ]
}

Expand Down
21 changes: 6 additions & 15 deletions chrome/chrome_android_paks.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# 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': [
Expand Down Expand Up @@ -69,9 +68,13 @@
],
}],
['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_<(arch_suffix).bin',
'<(chrome_android_pak_output_folder)/snapshot_blob_<(arch_suffix).bin',
'<(chrome_android_pak_output_folder)/natives_blob.bin',
'<(chrome_android_pak_output_folder)/snapshot_blob.bin',
],
}],
],
Expand All @@ -90,18 +93,6 @@
'<@(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'],
},
Expand Down
15 changes: 4 additions & 11 deletions chrome/chrome_tests_unit.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2913,8 +2913,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_<(arch_suffix).bin',
'<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suffix).bin',
'<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob.bin',
'<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob.bin',
],
}],
],
Expand All @@ -2926,23 +2926,16 @@
],
'variables': {
'dest_path': '<(asset_location)',
'renaming_sources': [
'src_files': [
'<(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',
'../build/android/v8_external_startup_data_arch_suffix.gypi'
],
'includes': [ '../build/apk_test.gypi' ],
},
],
'conditions': [
Expand Down
19 changes: 4 additions & 15 deletions chromecast/chromecast.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,25 +546,14 @@
'../third_party/icu/icu.gyp:icudata',
'../v8/tools/gyp/v8.gyp:v8_external_snapshot',
],
'variables': {
'dest_path': '<(PRODUCT_DIR)/assets',
'src_files': [
'copies': [{
'destination': '<(PRODUCT_DIR)/assets',
'files': [
'<(PRODUCT_DIR)/icudtl.dat',
],
'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',
'../build/android/v8_external_startup_data_arch_suffix.gypi',
],
}],
},
{
'target_name': 'libcast_shell_android',
Expand Down
35 changes: 13 additions & 22 deletions components/components_tests.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,12 @@
'<(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': [
Expand All @@ -1458,28 +1464,13 @@
'dependencies': [
'components_browsertests',
],
'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',
'copies': [
{
'destination': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
'files': [
'<@(components_browsertests_pak_input_resources)',
],
}
],
},
{
Expand Down
56 changes: 29 additions & 27 deletions content/content.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,34 +630,36 @@
],
},
{
'target_name': 'content_shell_assets_copy',
'target_name': 'content_icudata',
'type': 'none',
'dependencies': ['content_shell_and_tests.gyp:content_shell_pak'],
'variables': {
'src_files': ['<(PRODUCT_DIR)/content_shell.pak'],
'conditions': [
['v8_use_external_startup_data==1', {
'dependencies': ['<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot'],
'renaming_sources': [
'<(PRODUCT_DIR)/natives_blob.bin',
'<(PRODUCT_DIR)/snapshot_blob.bin',
],
'renaming_destinations': [
'natives_blob_<(arch_suffix).bin',
'snapshot_blob_<(arch_suffix).bin',
],
}],
['icu_use_data_file_flag==1', {
'dependencies': ['<(DEPTH)/third_party/icu/icu.gyp:icudata'],
'src_files': ['<(PRODUCT_DIR)/icudtl.dat'],
}],
],
'dest_path': '<(PRODUCT_DIR)/content_shell/assets',
'clear': 1,
},
'includes': [
'../build/android/copy_ex.gypi',
'../build/android/v8_external_startup_data_arch_suffix.gypi',
'conditions': [
['icu_use_data_file_flag==1', {
'copies': [
{
'destination': '<(PRODUCT_DIR)/content_shell/assets',
'files': [
'<(PRODUCT_DIR)/icudtl.dat',
],
},
],
}],
],
},
{
'target_name': 'content_v8_external_data',
'type': 'none',
'conditions': [
['v8_use_external_startup_data==1', {
'copies': [
{
'destination': '<(PRODUCT_DIR)/content_shell/assets',
'files': [
'<(PRODUCT_DIR)/natives_blob.bin',
'<(PRODUCT_DIR)/snapshot_blob.bin',
],
},
],
}],
],
},
],
Expand Down
17 changes: 15 additions & 2 deletions content/content_shell.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,16 @@
'browser/devtools/devtools_resources.gyp:devtools_resources',
],
}],
['OS=="android"', {
'copies': [
{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'
],
},
],
}],
['toolkit_views==1', {
'dependencies': [
'<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources'
Expand All @@ -427,7 +437,6 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
'conditions': [
['toolkit_views==1', {
'pak_inputs': [
Expand All @@ -436,6 +445,9 @@
}],
['OS!="android"', {
'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',],
'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
}, {
'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
}],
],
},
Expand Down Expand Up @@ -908,8 +920,9 @@
'target_name': 'content_shell_apk',
'type': 'none',
'dependencies': [
'content.gyp:content_shell_assets_copy',
'content.gyp:content_icudata',
'content.gyp:content_java',
'content.gyp:content_v8_external_data',
'content_java_test_support',
'content_shell_java',
'libcontent_shell_content_view',
Expand Down
Loading

0 comments on commit c2574ed

Please sign in to comment.