Build changes for android on arm

build/secondary/third_party/icu/BUILD.gn

 # Copyright 2014 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.
 
 import("//third_party/icu/config.gni")
 
 # Meta target that includes both icuuc and icui18n. Most targets want both.
 # You can depend on the individually if you need to.
 group("icu") {
   deps = [
@@ skipping 10 matching lines @@
   ]
 
   if (component_mode != "shared_library") {
     defines += [ "U_STATIC_IMPLEMENTATION" ]
   }
 
   include_dirs = [
     "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 mean "current_cpu"

+      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.
 config("icu_code") {
   cflags = []
   if (is_win) {
     # Disable some compiler warnings.
     cflags += [
       "/wd4005",  # Macro redefinition.
       "/wd4068",  # Unknown pragmas.
@@ skipping 26 matching lines @@
     "source/i18n/basictz.cpp",
     "source/i18n/bocsu.cpp",
     "source/i18n/brktrans.cpp",
     "source/i18n/buddhcal.cpp",
     "source/i18n/calendar.cpp",
     "source/i18n/casetrn.cpp",
     "source/i18n/cecal.cpp",
     "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 bunch of stuff.

+    "source/i18n/collation.cpp",
     "source/i18n/collationbasedatabuilder.cpp",
     "source/i18n/collationbuilder.cpp",
     "source/i18n/collationcompare.cpp",
-    "source/i18n/collation.cpp",
+    "source/i18n/collationdata.cpp",
     "source/i18n/collationdatabuilder.cpp",
-    "source/i18n/collationdata.cpp",
     "source/i18n/collationdatareader.cpp",
     "source/i18n/collationdatawriter.cpp",
+    "source/i18n/collationfastlatin.cpp",
     "source/i18n/collationfastlatinbuilder.cpp",
-    "source/i18n/collationfastlatin.cpp",
     "source/i18n/collationfcd.cpp",
     "source/i18n/collationiterator.cpp",
     "source/i18n/collationkeys.cpp",
     "source/i18n/collationroot.cpp",
     "source/i18n/collationrootelements.cpp",
     "source/i18n/collationruleparser.cpp",
     "source/i18n/collationsets.cpp",
     "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",
     "source/i18n/csdetect.cpp",
     "source/i18n/csmatch.cpp",
     "source/i18n/csr2022.cpp",
     "source/i18n/csrecog.cpp",
     "source/i18n/csrmbcs.cpp",
     "source/i18n/csrsbcs.cpp",
     "source/i18n/csrucode.cpp",
     "source/i18n/csrutf8.cpp",
     "source/i18n/curramt.cpp",
     "source/i18n/currfmt.cpp",
     "source/i18n/currpinf.cpp",
     "source/i18n/currunit.cpp",
     "source/i18n/dangical.cpp",
     "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",
     "source/i18n/dtitvinf.cpp",
     "source/i18n/dtptngen.cpp",
     "source/i18n/dtrule.cpp",
     "source/i18n/esctrn.cpp",
     "source/i18n/ethpccal.cpp",
     "source/i18n/filteredbrk.cpp",
+    "source/i18n/fmtable.cpp",
     "source/i18n/fmtable_cnv.cpp",
-    "source/i18n/fmtable.cpp",
     "source/i18n/format.cpp",
     "source/i18n/fphdlimp.cpp",
     "source/i18n/fpositer.cpp",
     "source/i18n/funcrepl.cpp",
     "source/i18n/gender.cpp",
     "source/i18n/gregocal.cpp",
     "source/i18n/gregoimp.cpp",
     "source/i18n/hebrwcal.cpp",
     "source/i18n/identifier_info.cpp",
     "source/i18n/indiancal.cpp",
@@ skipping 62 matching lines @@
     "source/i18n/tridpars.cpp",
     "source/i18n/tzfmt.cpp",
     "source/i18n/tzgnames.cpp",
     "source/i18n/tznames.cpp",
     "source/i18n/tznames_impl.cpp",
     "source/i18n/tzrule.cpp",
     "source/i18n/tztrans.cpp",
     "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",
     "source/i18n/udateintervalformat.cpp",
     "source/i18n/udatpg.cpp",
     "source/i18n/uitercollationiterator.cpp",
     "source/i18n/ulocdata.c",
     "source/i18n/umsg.cpp",
     "source/i18n/unesctrn.cpp",
     "source/i18n/uni2name.cpp",
     "source/i18n/unum.cpp",
     "source/i18n/unumsys.cpp",
     "source/i18n/upluralrules.cpp",
+    "source/i18n/uregex.cpp",
     "source/i18n/uregexc.cpp",
-    "source/i18n/uregex.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",
     "source/i18n/utf8collationiterator.cpp",
     "source/i18n/utmscale.c",
     "source/i18n/utrans.cpp",
     "source/i18n/vtzone.cpp",
     "source/i18n/vzone.cpp",
     "source/i18n/windtfmt.cpp",
     "source/i18n/winnmfmt.cpp",
@@ skipping 42 matching lines @@
   }
 }
 
 component("icuuc") {
   sources = [
     "source/common/appendable.cpp",
     "source/common/bmpset.cpp",
     "source/common/brkeng.cpp",
     "source/common/brkiter.cpp",
     "source/common/bytestream.cpp",
+    "source/common/bytestrie.cpp",
     "source/common/bytestriebuilder.cpp",
-    "source/common/bytestrie.cpp",
     "source/common/bytestrieiterator.cpp",
     "source/common/caniter.cpp",
     "source/common/chariter.cpp",
     "source/common/charstr.cpp",
     "source/common/cmemory.c",
     "source/common/cstring.c",
     "source/common/cwchar.c",
     "source/common/dictbe.cpp",
     "source/common/dictionarydata.cpp",
     "source/common/dtintrv.cpp",
@@ skipping 22 matching lines @@
     "source/common/punycode.cpp",
     "source/common/putil.cpp",
     "source/common/rbbi.cpp",
     "source/common/rbbidata.cpp",
     "source/common/rbbinode.cpp",
     "source/common/rbbirb.cpp",
     "source/common/rbbiscan.cpp",
     "source/common/rbbisetb.cpp",
     "source/common/rbbistbl.cpp",
     "source/common/rbbitblb.cpp",
+    "source/common/resbund.cpp",
     "source/common/resbund_cnv.cpp",
-    "source/common/resbund.cpp",
     "source/common/ruleiter.cpp",
     "source/common/schriter.cpp",
     "source/common/serv.cpp",
     "source/common/servlk.cpp",
     "source/common/servlkf.cpp",
     "source/common/servls.cpp",
     "source/common/servnotf.cpp",
     "source/common/servrbf.cpp",
     "source/common/servslkf.cpp",
     "source/common/sharedobject.cpp",
     "source/common/simplepatternformatter.cpp",
     "source/common/stringpiece.cpp",
     "source/common/stringtriebuilder.cpp",
     "source/common/uarrsort.c",
     "source/common/ubidi.c",
+    "source/common/ubidi_props.c",
     "source/common/ubidiln.c",
-    "source/common/ubidi_props.c",
     "source/common/ubidiwrt.c",
     "source/common/ubrk.cpp",
     "source/common/ucase.cpp",
     "source/common/ucasemap.cpp",
     "source/common/ucasemap_titlecase_brkiter.cpp",
     "source/common/ucat.c",
     "source/common/uchar.c",
+    "source/common/ucharstrie.cpp",
     "source/common/ucharstriebuilder.cpp",
-    "source/common/ucharstrie.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",
     "source/common/udataswp.c",
     "source/common/uenum.c",
     "source/common/uhash.c",
     "source/common/uhash_us.cpp",
     "source/common/uidna.cpp",
     "source/common/uinit.cpp",
     "source/common/uinvchar.c",
     "source/common/uiter.cpp",
     "source/common/ulist.c",
     "source/common/uloc.cpp",
     "source/common/uloc_keytype.cpp",
     "source/common/uloc_tag.c",
     "source/common/umapfile.c",
     "source/common/umath.c",
     "source/common/umutex.cpp",
     "source/common/unames.cpp",
     "source/common/unifiedcache.cpp",
     "source/common/unifilt.cpp",
     "source/common/unifunct.cpp",
+    "source/common/uniset.cpp",
     "source/common/uniset_closure.cpp",
-    "source/common/uniset.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/unorm.cpp",
     "source/common/unormcmp.cpp",
-    "source/common/unorm.cpp",
     "source/common/uobject.cpp",
     "source/common/uprops.cpp",
+    "source/common/ures_cnv.c",
     "source/common/uresbund.cpp",
-    "source/common/ures_cnv.c",
     "source/common/uresdata.c",
     "source/common/usc_impl.c",
     "source/common/uscript.c",
     "source/common/uscript_props.cpp",
     "source/common/uset.cpp",
+    "source/common/uset_props.cpp",
     "source/common/usetiter.cpp",
-    "source/common/uset_props.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/utrie.cpp",
+    "source/common/utrie2.cpp",
     "source/common/utrie2_builder.cpp",
-    "source/common/utrie2.cpp",
-    "source/common/utrie.cpp",
     "source/common/uts46.cpp",
     "source/common/utypes.c",
     "source/common/uvector.cpp",
     "source/common/uvectr32.cpp",
     "source/common/uvectr64.cpp",
     "source/common/wintz.c",
   ]
   defines = [ "U_COMMON_IMPLEMENTATION" ]
   deps = [
     ":icudata",
@@ skipping 72 matching lines @@
         sources = [
           "android/icudtl_dat.S",
         ]
       } else {
         assert(false, "No icu data for this platform")
       }
       defines = [ "U_HIDE_DATA_SYMBOL" ]
     }
   }
 }