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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 988183003: Build changes for android on arm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« build/config/arm.gni ('K') | « build/module_args/v8.gni ('k') | 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 53818c970057f1585d51291957b8e9937e38ddc8..c7f3fa44b8ab8c3385e75e7d2a4c3591e85f0371 100644
--- a/build/secondary/third_party/icu/BUILD.gn
+++ b/build/secondary/third_party/icu/BUILD.gn
@@ -28,6 +28,23 @@ config("icu_config") {
"source/common",
"source/i18n",
]
+
+ cflags = []
+ ldflags = []
+
+ if ((is_linux || is_mac || is_android) &&
+ (target_cpu == "arm" || target_cpu == "ia32" || target_cpu == "mipsel") &&
brettw 2015/03/16 17:16:36 I think everywhere here you have "target_cpu" you
+ current_toolchain == host_toolchain) {
+ cflags += [ "-m32" ]
+ ldflags += [ "-m32" ]
+ }
+ if ((is_linux || is_mac || is_android) && (target_cpu == "arm64" ||
+ target_cpu == "x64" ||
+ target_cpu == "mipsel64") &&
+ current_toolchain == host_toolchain) {
+ cflags += [ "-m64" ]
+ ldflags += [ "-m64" ]
+ }
}
# Config used only by ICU code.
@@ -74,16 +91,17 @@ component("icui18n") {
"source/i18n/chnsecal.cpp",
"source/i18n/choicfmt.cpp",
"source/i18n/coleitr.cpp",
+ "source/i18n/coll.cpp",
sky 2015/03/09 20:18:42 I ran gn format on this and it changed around a bu
+ "source/i18n/collation.cpp",
"source/i18n/collationbasedatabuilder.cpp",
"source/i18n/collationbuilder.cpp",
"source/i18n/collationcompare.cpp",
- "source/i18n/collation.cpp",
- "source/i18n/collationdatabuilder.cpp",
"source/i18n/collationdata.cpp",
+ "source/i18n/collationdatabuilder.cpp",
"source/i18n/collationdatareader.cpp",
"source/i18n/collationdatawriter.cpp",
- "source/i18n/collationfastlatinbuilder.cpp",
"source/i18n/collationfastlatin.cpp",
+ "source/i18n/collationfastlatinbuilder.cpp",
"source/i18n/collationfcd.cpp",
"source/i18n/collationiterator.cpp",
"source/i18n/collationkeys.cpp",
@@ -94,7 +112,6 @@ component("icui18n") {
"source/i18n/collationsettings.cpp",
"source/i18n/collationtailoring.cpp",
"source/i18n/collationweights.cpp",
- "source/i18n/coll.cpp",
"source/i18n/compactdecimalformat.cpp",
"source/i18n/coptccal.cpp",
"source/i18n/cpdtrans.cpp",
@@ -114,10 +131,10 @@ component("icui18n") {
"source/i18n/datefmt.cpp",
"source/i18n/dcfmtsym.cpp",
"source/i18n/decContext.c",
+ "source/i18n/decNumber.c",
"source/i18n/decfmtst.cpp",
"source/i18n/decimalformatpattern.cpp",
"source/i18n/decimfmt.cpp",
- "source/i18n/decNumber.c",
"source/i18n/digitlst.cpp",
"source/i18n/dtfmtsym.cpp",
"source/i18n/dtitvfmt.cpp",
@@ -127,8 +144,8 @@ component("icui18n") {
"source/i18n/esctrn.cpp",
"source/i18n/ethpccal.cpp",
"source/i18n/filteredbrk.cpp",
- "source/i18n/fmtable_cnv.cpp",
"source/i18n/fmtable.cpp",
+ "source/i18n/fmtable_cnv.cpp",
"source/i18n/format.cpp",
"source/i18n/fphdlimp.cpp",
"source/i18n/fpositer.cpp",
@@ -211,9 +228,9 @@ component("icui18n") {
"source/i18n/ucal.cpp",
"source/i18n/ucln_in.cpp",
"source/i18n/ucol.cpp",
- "source/i18n/ucoleitr.cpp",
"source/i18n/ucol_res.cpp",
"source/i18n/ucol_sit.cpp",
+ "source/i18n/ucoleitr.cpp",
"source/i18n/ucsdet.cpp",
"source/i18n/ucurr.cpp",
"source/i18n/udat.cpp",
@@ -227,13 +244,13 @@ component("icui18n") {
"source/i18n/unum.cpp",
"source/i18n/unumsys.cpp",
"source/i18n/upluralrules.cpp",
- "source/i18n/uregexc.cpp",
"source/i18n/uregex.cpp",
+ "source/i18n/uregexc.cpp",
"source/i18n/uregion.cpp",
"source/i18n/usearch.cpp",
+ "source/i18n/uspoof.cpp",
"source/i18n/uspoof_build.cpp",
"source/i18n/uspoof_conf.cpp",
- "source/i18n/uspoof.cpp",
"source/i18n/uspoof_impl.cpp",
"source/i18n/uspoof_wsconf.cpp",
"source/i18n/utf16collationiterator.cpp",
@@ -296,8 +313,8 @@ component("icuuc") {
"source/common/brkeng.cpp",
"source/common/brkiter.cpp",
"source/common/bytestream.cpp",
- "source/common/bytestriebuilder.cpp",
"source/common/bytestrie.cpp",
+ "source/common/bytestriebuilder.cpp",
"source/common/bytestrieiterator.cpp",
"source/common/caniter.cpp",
"source/common/chariter.cpp",
@@ -340,8 +357,8 @@ component("icuuc") {
"source/common/rbbisetb.cpp",
"source/common/rbbistbl.cpp",
"source/common/rbbitblb.cpp",
- "source/common/resbund_cnv.cpp",
"source/common/resbund.cpp",
+ "source/common/resbund_cnv.cpp",
"source/common/ruleiter.cpp",
"source/common/schriter.cpp",
"source/common/serv.cpp",
@@ -357,8 +374,8 @@ component("icuuc") {
"source/common/stringtriebuilder.cpp",
"source/common/uarrsort.c",
"source/common/ubidi.c",
- "source/common/ubidiln.c",
"source/common/ubidi_props.c",
+ "source/common/ubidiln.c",
"source/common/ubidiwrt.c",
"source/common/ubrk.cpp",
"source/common/ucase.cpp",
@@ -366,35 +383,35 @@ component("icuuc") {
"source/common/ucasemap_titlecase_brkiter.cpp",
"source/common/ucat.c",
"source/common/uchar.c",
- "source/common/ucharstriebuilder.cpp",
"source/common/ucharstrie.cpp",
+ "source/common/ucharstriebuilder.cpp",
"source/common/ucharstrieiterator.cpp",
"source/common/uchriter.cpp",
"source/common/ucln_cmn.cpp",
"source/common/ucmndata.c",
+ "source/common/ucnv.c",
"source/common/ucnv2022.cpp",
"source/common/ucnv_bld.cpp",
- "source/common/ucnvbocu.cpp",
- "source/common/ucnv.c",
"source/common/ucnv_cb.c",
"source/common/ucnv_cnv.c",
"source/common/ucnv_ct.c",
- "source/common/ucnvdisp.c",
"source/common/ucnv_err.c",
"source/common/ucnv_ext.cpp",
- "source/common/ucnvhz.c",
"source/common/ucnv_io.cpp",
- "source/common/ucnvisci.c",
- "source/common/ucnvlat1.c",
"source/common/ucnv_lmb.c",
- "source/common/ucnvmbcs.cpp",
- "source/common/ucnvscsu.c",
- "source/common/ucnvsel.cpp",
"source/common/ucnv_set.c",
"source/common/ucnv_u16.c",
"source/common/ucnv_u32.c",
"source/common/ucnv_u7.c",
"source/common/ucnv_u8.c",
+ "source/common/ucnvbocu.cpp",
+ "source/common/ucnvdisp.c",
+ "source/common/ucnvhz.c",
+ "source/common/ucnvisci.c",
+ "source/common/ucnvlat1.c",
+ "source/common/ucnvmbcs.cpp",
+ "source/common/ucnvscsu.c",
+ "source/common/ucnvsel.cpp",
"source/common/ucol_swp.cpp",
"source/common/udata.cpp",
"source/common/udatamem.c",
@@ -417,49 +434,49 @@ component("icuuc") {
"source/common/unifiedcache.cpp",
"source/common/unifilt.cpp",
"source/common/unifunct.cpp",
- "source/common/uniset_closure.cpp",
"source/common/uniset.cpp",
+ "source/common/uniset_closure.cpp",
"source/common/uniset_props.cpp",
"source/common/unisetspan.cpp",
+ "source/common/unistr.cpp",
"source/common/unistr_case.cpp",
"source/common/unistr_case_locale.cpp",
"source/common/unistr_cnv.cpp",
- "source/common/unistr.cpp",
"source/common/unistr_props.cpp",
"source/common/unistr_titlecase_brkiter.cpp",
- "source/common/unormcmp.cpp",
"source/common/unorm.cpp",
+ "source/common/unormcmp.cpp",
"source/common/uobject.cpp",
"source/common/uprops.cpp",
- "source/common/uresbund.cpp",
"source/common/ures_cnv.c",
+ "source/common/uresbund.cpp",
"source/common/uresdata.c",
"source/common/usc_impl.c",
"source/common/uscript.c",
"source/common/uscript_props.cpp",
"source/common/uset.cpp",
- "source/common/usetiter.cpp",
"source/common/uset_props.cpp",
+ "source/common/usetiter.cpp",
"source/common/ushape.cpp",
"source/common/usprep.cpp",
"source/common/ustack.cpp",
+ "source/common/ustr_cnv.cpp",
+ "source/common/ustr_titlecase_brkiter.cpp",
+ "source/common/ustr_wcs.cpp",
"source/common/ustrcase.cpp",
"source/common/ustrcase_locale.cpp",
- "source/common/ustr_cnv.cpp",
"source/common/ustrenum.cpp",
"source/common/ustrfmt.c",
"source/common/ustring.cpp",
- "source/common/ustr_titlecase_brkiter.cpp",
"source/common/ustrtrns.cpp",
- "source/common/ustr_wcs.cpp",
"source/common/utext.cpp",
"source/common/utf_impl.c",
"source/common/util.cpp",
"source/common/util_props.cpp",
"source/common/utrace.c",
- "source/common/utrie2_builder.cpp",
- "source/common/utrie2.cpp",
"source/common/utrie.cpp",
+ "source/common/utrie2.cpp",
+ "source/common/utrie2_builder.cpp",
"source/common/uts46.cpp",
"source/common/utypes.c",
"source/common/uvector.cpp",
« build/config/arm.gni ('K') | « build/module_args/v8.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698