commit 965b6b2599050aab93cc398630d10ce30f3b4248
author michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu Sep 29 16:07:28 2011
committer michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu Sep 29 16:07:28 2011
tree be386afe242d264343e8bb37ea54de3d01538447
parent 37e2e16634b016599c72c8ac02feb3d62fbcffb5

Upstream: The change of common.gypi

- Exclude android specific files when building with 'host' toolset.
- Not using system icu by default.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8060038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103286 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi
index 90b8451..ef9b233e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -627,7 +627,7 @@
         'use_system_harfbuzz%': '0',
 
         # Use the system icu.
-        'use_system_icu%': 1,
+        'use_system_icu%': 0,
 
         # Choose static link by build type.
         'conditions': [
@@ -2006,6 +2006,10 @@
               '-Wl,-O1',
               '-Wl,--as-needed',
             ],
+            'sources/': [
+              ['exclude', '_android(_unittest)?\\.cc$'],
+              ['exclude', '(^|/)android/']
+            ],
           }],
         ],
       },