Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2828)

Unified Diff: build/secondary/third_party/icu/BUILD.gn

Issue 377113002: Support icu_use_data_file in BUILD.gn for icu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/icu/BUILD.gn
diff --git a/build/secondary/third_party/icu/BUILD.gn b/build/secondary/third_party/icu/BUILD.gn
index cfb49f6f10eeb8f9bf2908387f3a2b15b42a7e13..3907618d281f7755d7fcc993bd7041bf0faad6ed 100644
--- a/build/secondary/third_party/icu/BUILD.gn
+++ b/build/secondary/third_party/icu/BUILD.gn
@@ -2,6 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+declare_args() {
+ # Tells icu to load an external data file rather than rely on the icudata
+ # being linked directly into the binary.
+ icu_use_data_file = false
+}
+
# Meta target that includes both icuuc and icui18n. Most targets want both.
# You can depend on the individually if you need to.
group("icu") {
@@ -394,7 +400,6 @@ component("icuuc") {
"source/common/uvectr32.cpp",
"source/common/uvectr64.cpp",
"source/common/wintz.c",
- "source/stubdata/stubdata.c",
]
defines = [
"U_COMMON_IMPLEMENTATION",
@@ -415,30 +420,57 @@ component("icuuc") {
direct_dependent_configs = [ ":icu_config" ]
- if (!is_win) {
- sources -= [ "source/stubdata/stubdata.c" ]
+ if (is_win || icu_use_data_file) {
+ sources += [ "source/stubdata/stubdata.c" ]
}
}
-if (is_win) {
- # On Windows the target DLL is pre-built so just use a copy rule.
- copy("icudata") {
- sources = [ "windows/icudt.dll" ]
- outputs = [ "$root_out_dir/icudt.dll" ]
+# TODO(GYP) support use_system_icu.
+if (icu_use_data_file) {
+ if (is_ios) {
+ # TODO(GYP): Support mac resource bundle shown below.
+ # 'link_settings': {
+ # 'mac_bundle_resources': [
+ # 'source/data/in/icudtl.dat',
+ # ],
+ # }
+ } else {
+ copy("icudata") {
+ if (is_android) {
+ sources = [ "android/icudt.dat" ]
+ } else {
+ sources = [ "source/data/in/icudtl.dat" ]
+ }
+
+ outputs = [ "$root_out_dir/icudtl.dat" ]
+ }
}
} else {
- source_set("icudata") {
- sources = [
+ if (is_win) {
+ # On Windows the target DLL is pre-built so just use a copy rule.
+ copy("icudata") {
+ sources = [ "windows/icudt.dll" ]
+ outputs = [ "$root_out_dir/icudt.dll" ]
+ }
+ } else {
+ source_set("icudata") {
# These are hand-generated, but will do for now. The linux version is an
# identical copy of the (mac) icudt46l_dat.S file, modulo removal of the
# .private_extern and .const directives and with no leading underscore on
# the icudt46_dat symbol.
- "android/icudt46l_dat.S",
- "linux/icudt46l_dat.S",
- "mac/icudt46l_dat.S",
- ]
- defines = [ "U_HIDE_DATA_SYMBOL" ]
-
- # TODO(brettw) support use_system_icu and icu_use_data_file_flag.
+ #
+ # TODO(GYP): Gyp has considerations here for QNX and for the host toolchain
+ # that have not been ported over.
+ if (is_linux) {
+ sources = [ "linux/icudt46l_dat.S" ]
+ } else if (is_mac) {
+ sources = [ "mac/icudt46l_dat.S" ]
+ } else if (is_android) {
+ sources = [ "android/icudt46l_dat.S" ]
+ } else {
+ assert(false, "No icu data for this platform")
+ }
+ defines = [ "U_HIDE_DATA_SYMBOL" ]
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698