summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/android/java/src/org/chromium/base/ApkAssets.java13
-rwxr-xr-xbuild/android/gyp/package_resources.py15
-rw-r--r--build/android/v8_external_startup_data_arch_suffix.gypi21
-rw-r--r--build_overrides/v8.gni18
-rw-r--r--chrome/android/BUILD.gn6
-rw-r--r--chrome/chrome_android_paks.gypi21
-rw-r--r--chrome/chrome_tests_unit.gypi15
-rw-r--r--chromecast/chromecast.gyp11
-rw-r--r--components/components_tests.gyp23
-rw-r--r--components/html_viewer/BUILD.gn4
-rw-r--r--content/content.gyp7
-rw-r--r--content/content_shell.gypi9
-rw-r--r--content/content_tests.gypi15
-rw-r--r--content/shell/android/BUILD.gn6
-rw-r--r--gin/v8_initializer.cc11
-rw-r--r--net/net.gyp15
-rw-r--r--third_party/WebKit/Source/platform/blink_platform_tests.gyp15
-rw-r--r--third_party/WebKit/Source/web/web_tests.gyp9
18 files changed, 64 insertions, 170 deletions
diff --git a/base/android/java/src/org/chromium/base/ApkAssets.java b/base/android/java/src/org/chromium/base/ApkAssets.java
index e00be99..a30054f 100644
--- a/base/android/java/src/org/chromium/base/ApkAssets.java
+++ b/base/android/java/src/org/chromium/base/ApkAssets.java
@@ -33,6 +33,19 @@ public class ApkAssets {
afd.getStartOffset(),
afd.getLength() };
} catch (IOException e) {
+ // TODO(michaelbai): Remove dump assets once crbug.com/547235 fixed.
+ try {
+ String[] assets = context.getAssets().list("");
+ StringBuffer sb = new StringBuffer("Dump assets(" + assets.length + "):\n");
+ for (String asset : assets) {
+ sb.append(asset);
+ sb.append("\n");
+ }
+ Log.e(LOGTAG, sb.toString());
+ } catch (IOException ioe) {
+ Log.e(LOGTAG, "Error while list assets: " + ioe);
+ }
+
Log.e(LOGTAG, "Error while loading asset " + fileName + ": " + e);
return new long[] {-1, -1, -1};
} finally {
diff --git a/build/android/gyp/package_resources.py b/build/android/gyp/package_resources.py
index a1f3840..68c7b49 100755
--- a/build/android/gyp/package_resources.py
+++ b/build/android/gyp/package_resources.py
@@ -296,26 +296,15 @@ def main(args):
options.language_splits))
input_paths = [ options.android_manifest ] + options.resource_zips
-
- input_strings = []
- input_strings.extend(package_command)
-
- # The md5_check.py doesn't count file path in md5 intentionally,
- # in order to repackage resources when assets' name changed, we need
- # to put assets into input_strings, as we know the assets path isn't
- # changed among each build if there is no asset change.
if options.asset_dir and os.path.exists(options.asset_dir):
- asset_paths = []
for root, _, filenames in os.walk(options.asset_dir):
- asset_paths.extend(os.path.join(root, f) for f in filenames)
- input_paths.extend(asset_paths)
- input_strings.extend(sorted(asset_paths))
+ input_paths.extend(os.path.join(root, f) for f in filenames)
build_utils.CallAndWriteDepfileIfStale(
lambda: _OnStaleMd5(package_command, options),
options,
input_paths=input_paths,
- input_strings=input_strings,
+ input_strings=package_command,
output_paths=output_paths)
diff --git a/build/android/v8_external_startup_data_arch_suffix.gypi b/build/android/v8_external_startup_data_arch_suffix.gypi
deleted file mode 100644
index 7af2443..0000000
--- a/build/android/v8_external_startup_data_arch_suffix.gypi
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'arch_suffix': '<(arch_suffix)',
- 'variables': {
- # This help to find out if target_arch is set to something else.
- 'arch_suffix': '<(target_arch)',
- 'conditions': [
- ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', {
- 'arch_suffix': '32',
- }],
- ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
- 'arch_suffix':'64'
- }],
- ],
- }
- }
-}
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
index f1f27de..ee1b666 100644
--- a/build_overrides/v8.gni
+++ b/build_overrides/v8.gni
@@ -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_out_dir/natives_blob.bin",
- "$root_out_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",
- ]
- }
-}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 2cc0f56a..0152226 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -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_out_dir/natives_blob.bin",
+ "$root_out_dir/snapshot_blob.bin",
+ ]
deps += [ "//v8" ]
}
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi
index aa32574..1ebd363 100644
--- a/chrome/chrome_android_paks.gypi
+++ b/chrome/chrome_android_paks.gypi
@@ -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': [
@@ -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',
],
}],
],
@@ -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'],
},
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index ef21a0c..1f179ff 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2915,8 +2915,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',
],
}],
],
@@ -2928,23 +2928,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': [
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 87988e6..3e5ea4a 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -538,7 +538,6 @@
# Targets for Android receiver.
'conditions': [
['OS=="android"', {
- 'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi',],
'variables': {
'cast_shell_assets_path': '<(PRODUCT_DIR)/assets/cast_shell_apk',
},
@@ -555,15 +554,9 @@
'src_files': [
'<(PRODUCT_DIR)/icudtl.dat',
'<(PRODUCT_DIR)/assets/cast_shell.pak',
- ],
- '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'],
@@ -672,8 +665,8 @@
'additional_input_paths': [
'<(asset_location)/cast_shell.pak',
'<(asset_location)/icudtl.dat',
- '<(asset_location)/natives_blob_<(arch_suffix).bin',
- '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
+ '<(asset_location)/natives_blob.bin',
+ '<(asset_location)/snapshot_blob.bin',
],
},
'includes': [ '../build/java_apk.gypi' ],
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index be711d9..5ef7bd8 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1464,9 +1464,14 @@
'<(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',
@@ -1480,18 +1485,6 @@
'<@(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'],
},
@@ -1531,8 +1524,8 @@
}],
['v8_use_external_startup_data==1', {
'additional_input_paths': [
- '<(asset_location)/natives_blob_<(arch_suffix).bin',
- '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
+ '<(asset_location)/natives_blob.bin',
+ '<(asset_location)/snapshot_blob.bin',
],
}],
],
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index 3497f8a..894d6b3 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -302,9 +302,9 @@ if (is_android) {
sources = [
"$root_build_dir/html_viewer.pak",
"$root_build_dir/icudtl.dat",
+ "$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
}
generate_mojo_shell_assets_list("build_unittest_assets") {
diff --git a/content/content.gyp b/content/content.gyp
index f1a2a97..bda908c 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -638,14 +638,10 @@
'conditions': [
['v8_use_external_startup_data==1', {
'dependencies': ['<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot'],
- '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',
- ],
}],
['icu_use_data_file_flag==1', {
'dependencies': ['<(DEPTH)/third_party/icu/icu.gyp:icudata'],
@@ -657,7 +653,6 @@
},
'includes': [
'../build/android/copy_ex.gypi',
- '../build/android/v8_external_startup_data_arch_suffix.gypi',
],
},
],
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 637b557..4a77d2b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -941,16 +941,13 @@
}],
['v8_use_external_startup_data==1', {
'additional_input_paths': [
- '<(asset_location)/natives_blob_<(arch_suffix).bin',
- '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
+ '<(asset_location)/natives_blob.bin',
+ '<(asset_location)/snapshot_blob.bin',
],
}],
],
},
- 'includes': [
- '../build/android/v8_external_startup_data_arch_suffix.gypi',
- '../build/java_apk.gypi',
- ],
+ 'includes': [ '../build/java_apk.gypi' ],
},
],
}], # OS=="android"
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 867069d..04ba14e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1878,14 +1878,10 @@
],
'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'],
@@ -1898,16 +1894,13 @@
['v8_use_external_startup_data==1', {
'asset_location': '<(PRODUCT_DIR)/content_unittests_apk/assets',
'additional_input_paths': [
- '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
- '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+ '<(PRODUCT_DIR)/content_unittests_apk/assets/natives_blob.bin',
+ '<(PRODUCT_DIR)/content_unittests_apk/assets/snapshot_blob.bin',
],
}],
],
},
- 'includes': [
- '../build/apk_test.gypi',
- '../build/android/v8_external_startup_data_arch_suffix.gypi',
- ],
+ 'includes': [ '../build/apk_test.gypi' ],
},
{
'target_name': 'content_shell_browsertests_java',
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 94e0d9f..4fd3e85 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -102,8 +102,10 @@ copy_ex("copy_content_shell_assets") {
deps += [ "//third_party/icu:icudata" ]
}
if (v8_use_external_startup_data) {
- renaming_sources = v8_external_startup_data_renaming_sources
- renaming_destinations = v8_external_startup_data_renaming_destinations
+ sources += [
+ "$root_out_dir/natives_blob.bin",
+ "$root_out_dir/snapshot_blob.bin",
+ ]
deps += [ "//v8" ]
}
}
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 8bcc78d..810225c 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -53,19 +53,8 @@ base::PlatformFile g_snapshot_pf = kInvalidPlatformFile;
base::MemoryMappedFile::Region g_natives_region;
base::MemoryMappedFile::Region g_snapshot_region;
-#if defined(OS_ANDROID)
-#ifdef __LP64__
-const char kNativesFileName[] = "natives_blob_64.bin";
-const char kSnapshotFileName[] = "snapshot_blob_64.bin";
-#else
-const char kNativesFileName[] = "natives_blob_32.bin";
-const char kSnapshotFileName[] = "snapshot_blob_32.bin";
-#endif // __LP64__
-
-#else // defined(OS_ANDROID)
const char kNativesFileName[] = "natives_blob.bin";
const char kSnapshotFileName[] = "snapshot_blob.bin";
-#endif // defined(OS_ANDROID)
void GetV8FilePath(const char* file_name, base::FilePath* path_out) {
#if !defined(OS_MACOSX)
diff --git a/net/net.gyp b/net/net.gyp
index 61b2c75..3241d9a 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1528,14 +1528,10 @@
],
'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'],
@@ -1550,16 +1546,13 @@
['v8_use_external_startup_data==1', {
'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
'additional_input_paths': [
- '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
- '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+ '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
+ '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
],
}],
],
},
- 'includes': [
- '../build/apk_test.gypi',
- '../build/android/v8_external_startup_data_arch_suffix.gypi',
- ],
+ 'includes': [ '../build/apk_test.gypi' ],
},
{
'target_name': 'net_junit_tests',
diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index ee8e54d..dc7e333 100644
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -146,14 +146,10 @@
],
'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'],
@@ -165,16 +161,13 @@
['v8_use_external_startup_data==1', {
'asset_location': '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets',
'additional_input_paths': [
- '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
- '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+ '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob.bin',
+ '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob.bin',
],
}],
],
},
- 'includes': [
- '../../../../build/apk_test.gypi',
- '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
- ],
+ 'includes': [ '../../../../build/apk_test.gypi' ],
},
{
'target_name': 'blink_platform_unittests_apk',
diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp
index 98807e3..f036b66 100644
--- a/third_party/WebKit/Source/web/web_tests.gyp
+++ b/third_party/WebKit/Source/web/web_tests.gyp
@@ -153,16 +153,13 @@
'conditions': [
['v8_use_external_startup_data==1', {
'additional_input_paths': [
- '<(asset_location)/natives_blob_<(arch_suffix).bin',
- '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
+ '<(asset_location)/natives_blob.bin',
+ '<(asset_location)/snapshot_blob.bin',
],
}],
],
},
- 'includes': [
- '../../../../build/apk_test.gypi',
- '../../../../build/android/v8_external_startup_data_arch_suffix.gypi',
- ],
+ 'includes': [ '../../../../build/apk_test.gypi' ],
}],
}],
['test_isolation_mode != "noop"', {
generated by cgit v1.1 at 2024-05-19 21:47:07 +0000