net/net.gyp - Issue 139743016: android: Fold all_android.gyp into all.gyp.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: comment 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:

Index: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 9b10a414e51a9d49a955654adf2933e556d5826d..35f192167350672295f0827bc2e0878b50ee921f 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -2595,7 +2595,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/all_android.gyp ('K') | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »