Merge third_party/icu from https://chromium.googlesource.com/chromium/deps/icu46.git at 364ba1d000a5b85f577f36701c6fd43810a1daa5

This commit was generated by merge_from_chromium.py.

Change-Id: I763bff6f3a42145f4c9a94b30048681b81807d15

1 files changed, 15 insertions, 0 deletions

diff --git a/icu.gyp b/icu.gyp
index 3724fbd..f34c578 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -25,6 +25,21 @@
           'U_STATIC_IMPLEMENTATION',
         ],
       }],
+      ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+         or OS=="netbsd" or OS=="mac" or OS=="android") and \
+        (target_arch=="arm" or target_arch=="ia32" or \
+         target_arch=="mipsel")', {
+        'target_conditions': [
+          ['_toolset=="host"', {
+            'cflags': [ '-m32' ],
+            'ldflags': [ '-m32' ],
+            'asflags': [ '-32' ],
+            'xcode_settings': {
+              'ARCHS': [ 'i386' ],
+            },
+          }],
+        ],
+      }],
     ],
     'include_dirs': [
       'source/common',