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

Unified Diff: BUILD.gn

Issue 2197523002: Fix isolate_tests/clean isolate step (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: explicitly specify icu data bundle name for "data" Created 4 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.gn
diff --git a/BUILD.gn b/BUILD.gn
index 80764aa8daf0be3c7511019e3cf2906271ddec5a..eb4ae7bdd22649e96a417f9c50107abaae51f169 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -571,10 +571,14 @@ if (is_android && enable_java_templates) {
# TODO(GYP): Gyp has considerations here for QNX and for the host toolchain
# that have not been ported over.
-data_bundle = "common/icudtl.dat"
+big_endian = false
+if (current_cpu == "mips" || current_cpu == "mips64") {
+ big_endian = true
+}
+
if (is_android) {
data_bundle = "android/icudtl.dat"
-} else if (current_cpu == "mips" || current_cpu == "mips64") {
+} else if (big_endian) {
data_bundle = "common/icudtb.dat"
} else {
data_bundle = "common/icudtl.dat"
@@ -591,6 +595,12 @@ if (icu_use_data_file) {
copy("icudata") {
sources = [ "$data_bundle" ]
outputs = [ "$root_out_dir/{{source_file_part}}" ]
+ # {{source_file_part}} is not expanded in 'data'.
+ if (big_endian) {
Michael Achenbach 2016/07/29 11:44:37 Not sure if I understand. Who consumes data? The c
+ data = [ "$root_out_dir/icudtb.dat" ]
+ } else {
+ data = [ "$root_out_dir/icudtl.dat" ]
+ }
}
}
} else {
@@ -600,12 +610,11 @@ if (icu_use_data_file) {
sources = [
"windows/icudt.dll",
]
- outputs = [
- "$root_out_dir/icudt.dll",
- ]
+ outputs = [ "$root_out_dir/icudt.dll" ]
+ data = outputs
}
} else {
- if (current_cpu == "mips" || current_cpu == "mips64") {
+ if (big_endian) {
data_assembly = "$target_gen_dir/icudtb_dat.S"
} else {
data_assembly = "$target_gen_dir/icudtl_dat.S"
« 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