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

Unified Diff: build/common.gypi

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix a bug in ssl_client_socket_openssl.cc and address comments Created 9 years, 1 month 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f3b8de473827313e0ea9d86d4ab3b4a79da9f259..60ebbfa411cab6e8ffe14aadec0de1f67347bdf0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1190,7 +1190,7 @@
'-Wsign-compare',
]
}],
- [ 'os_posix==1 and OS!="mac" and OS!="openbsd" and chromeos==0', {
+ [ 'os_posix==1 and OS!="mac" and OS!="openbsd" and OS!="android" and chromeos==0', {
'cflags': [
# Don't warn about ignoring the return value from e.g. close().
# This is off by default in some gccs but on by default in others.
@@ -2065,15 +2065,15 @@
# any Chromium gyp or gypi file. Maybe they come from
# gyp itself?
'-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',
- ],
- 'libraries': [
- '-l<(android_stlport_library)',
- # Manually link the libgcc.a that the cross compiler uses.
- '<!($CROSS_CC -print-libgcc-file-name)',
- '-lc',
- '-ldl',
- '-lstdc++',
- '-lm',
+ ],
+ 'libraries': [
+ '-l<(android_stlport_library)',
+ # Manually link the libgcc.a that the cross compiler uses.
+ '<!($CROSS_CC -print-libgcc-file-name)',
+ '-lc',
+ '-ldl',
+ '-lstdc++',
+ '-lm',
],
'conditions': [
['android_build_type==0', {

Powered by Google App Engine
This is Rietveld 408576698