AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Do not define use_icu_data_file_flag.

Browse Source 
use_icu_data_file from //third_party/icu should be used.
//third_party/icu also defines ICU_UTIL_DATA_IMPL.

BUG=chromium:610673,chromium:474921

Review-Url: https://codereview.chromium.org/1996033002
Cr-Commit-Position: refs/heads/master@{#36371}
This commit is contained in:
altimin 2016-05-19 08:50:14 -07:00 committed by Commit bot
parent cbdb373804
commit a2956f4243
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BUILD.gn
View File

@ -18,10 +18,6 @@ import("//build_overrides/v8.gni")
import("snapshot_toolchain.gni")
declare_args() {
# Use ICU data file (icudtl.dat) if true or library (shared on windows,
# static otherwise).
icu_use_data_file_flag = true
# Enable the snapshot feature, for fast context creation.
# http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html
v8_use_snapshot = true
@ -1839,14 +1835,6 @@ v8_source_set("v8_base") {
if (is_win) {
deps += [ "//third_party/icu:icudata" ]
}
if (icu_use_data_file_flag) {
defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ]
} else if (is_win) {
defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED" ]
} else {
defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC" ]
}
} else {
sources -= [
"src/i18n.cc",

2
DEPS
View File

@ -12,7 +12,7 @@ deps = {
"v8/tools/gyp":
Var("git_url") + "/external/gyp.git" + "@" + "bce1c7793010574d88d7915e2d55395213ac63d1",
"v8/third_party/icu":
Var("git_url") + "/chromium/deps/icu.git" + "@" + "c291cde264469b20ca969ce8832088acb21e0c48",
Var("git_url") + "/chromium/deps/icu.git" + "@" + "d9f48be67ba790adbc59d3ab195b2d8278c9d73b",
"v8/buildtools":
Var("git_url") + "/chromium/buildtools.git" + "@" + "06e80a0e17319868d4a9b13f9bb6a248dc8d8b20",
"v8/base/trace_event/common":

2
build_overrides/v8.gni
View File

@ -22,7 +22,7 @@ if (((v8_target_arch == "ia32" ||
v8_enable_gdbjit = true
}
icu_use_data_file_flag = false
icu_use_data_file = false
v8_imminent_deprecation_warnings = true
v8_optimized_debug = false
v8_extra_library_files = []