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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 8060038: Upstream: The change of common.gypi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added the missing toolset change. Created 9 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1d77143080fc7e78f8332226afab943eeff714cb..8b9d913042206452f3c3b23a96ce7200f07b7bf1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -626,7 +626,7 @@
'use_system_harfbuzz%': '0',
# Use the system icu.
- 'use_system_icu%': 1,
+ 'use_system_icu%': 0,
# Choose static link by build type.
'conditions': [
@@ -2005,6 +2005,10 @@
'-Wl,-O1',
'-Wl,--as-needed',
],
+ 'sources/': [
+ ['exclude', '_android(_unittest)?\\.cc$'],
+ ['exclude', '(^|/)android/']
+ ],
}],
],
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698