Exclude most lang, all region and all curr data for chromium-android.

Curr data is unused by chromium-android which doesn't support JavaScript i18n
API for now. On Android, display name of region and lang are accessed through
Java API (except for zh_Hans and zh_Hant which are not supported by Java API),
so we also exclude lang (except for language zh and scripts Hans and Hant) and
region data. This could totally reduce the uncompressed binary size of
chromium-android by nearly 2MB.

Also BTW upstreaming some other Android local changes to third_party/icu.

BUG=none
TEST=L10nUtilTest.GetDisplayNameForLocale,L10nUtilTest.GetDisplayNameForCountry



git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@135385 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

1 files changed, 21 insertions, 52 deletions

diff --git a/icu.gyp b/icu.gyp
index c027789..30b3d88 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
@@ -67,12 +67,17 @@
             [ 'OS == "win" or OS == "mac" or OS == "android"', {
               'sources!': ['linux/icudt46l_dat.S'],
             }],
+            [ 'OS == "android"', {
+              # Android builds ImageDiff for host, which has a dependency on
+              # newwtf so needs to be able to build this target for host as
+              # well.
+              'toolsets': ['host', 'target'],
+            }, { # 'OS != "android"',
+              'sources!': ['android/icudt46l_dat.S'],
+            }],
             [ 'OS != "mac"', {
               'sources!': ['mac/icudt46l_dat.S'],
             }],
-            [ 'OS != "android"', {
-              'sources!': ['android/icudt46l_dat.S'],
-            }],
             [ 'OS != "win" and icu_use_data_file_flag', {
               # Remove any assembly data file.
               'sources/': [['exclude', 'icudt46l_dat']],
@@ -284,6 +289,12 @@
                 '-frtti',
               ],
             }],
+            ['OS == "android"', {
+              # Android builds ImageDiff for host, which has a dependency on
+              # newwtf so needs to be able to build this target for host as
+              # well.
+              'toolsets': ['host', 'target'],
+            }],
             ['OS == "mac"', {
               'xcode_settings': {
                 'GCC_ENABLE_CPP_RTTI': 'YES',       # -frtti
@@ -296,11 +307,6 @@
                 },
               }
             }],
-            ['OS == "android"', {
-              'dependencies': [
-                'gabi++',
-              ],
-            }],
             ['clang==1', {
               'xcode_settings': {
                 'WARNING_CFLAGS': [
@@ -527,6 +533,12 @@
                 '-frtti',
               ],
             }],
+            ['OS == "android"', {
+              # Android builds ImageDiff for host, which has a dependency on
+              # newwtf so needs to be able to build this target for host as
+              # well.
+              'toolsets': ['host', 'target'],
+            }],
             ['OS == "mac"', {
               'xcode_settings': {
                 'GCC_ENABLE_CPP_RTTI': 'YES',       # -frtti
@@ -539,11 +551,6 @@
                 },
               }
             }],
-            ['OS == "android"', {
-              'dependencies': [
-                'gabi++',
-              ],
-            }],
             ['clang==1', {
               'xcode_settings': {
                 'WARNING_CFLAGS': [
@@ -571,44 +578,6 @@
           ],
         },
       ],
-      'conditions': [
-        ['OS=="android"', {
-          'targets': [
-            {
-              'target_name': 'gabi++',
-              'type': 'none',
-              'direct_dependent_settings': {
-                'include_dirs': [
-                  '<(android_ndk_root)/sources/cxx-stl/gabi++/include',
-                ],
-              },
-              'conditions': [
-                ['target_arch=="arm" and armv7==1', {
-                  'link_settings': {
-                    'libraries': [
-                      '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a',
-                    ]
-                  },
-                }],
-                ['target_arch=="arm" and armv7==0', {
-                  'link_settings': {
-                    'libraries': [
-                      '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a',
-                    ]
-                  },
-                }],
-                ['target_arch=="ia32"', {
-                  'link_settings': {
-                    'libraries': [
-                      '<(android_ndk_root)/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a',
-                    ]
-                  },
-                }],
-              ],
-            },
-          ],
-        }],
-      ],
     }, { # use_system_icu != 0
       'targets': [
         {