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

Unified Diff: net/net.gyp

Issue 139743016: android: Fold all_android.gyp into all.gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 11 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
« build/android/envsetup_functions.sh ('K') | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index a40f39388e3f1a285b81d6b493b446772e4aca7a..5d230cd48cd5ad750e1de56743106808d9efc0e5 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2604,7 +2604,7 @@
},
],
}],
- ['OS != "ios"', {
+ ['OS != "ios" and OS != "android"', {
'targets': [
# iOS doesn't have the concept of simple executables, these targets
# can't be compiled on the platform.
« build/android/envsetup_functions.sh ('K') | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698