net/net.gyp - Issue 747773002: Upstream "nsurl_util.{h,mm}" from Chrome on iOS repository.

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 747773002: Upstream "nsurl_util.{h,mm}" from Chrome on iOS repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments from mmenke, round two. Created 6 years 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: net/net.gyp

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

index 6f264fb867491b9c914c4e29f8a248a2a20b183c..655c83c47532a9ec248a2f17b1c6cbd53c3b74b6 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -442,6 +442,12 @@

+ [ 'OS == "ios" or OS == "mac"', {

+ 'sources': [

+ '<@(net_base_mac_ios_sources)',

+ ],

+ },

+ ],

['OS=="android" and _toolset=="target" and android_webview_build == 0', {

'dependencies': [

'net_java',

@@ -546,6 +552,11 @@

'<@(net_linux_test_sources)',

}],

+ ['OS == "mac" or OS == "ios"', {

+ 'sources': [

+ '<@(net_base_test_mac_ios_sources)',

+ ],

+ }],

['chromeos==1', {

'sources!': [

'proxy/proxy_config_service_linux_unittest.cc',

« no previous file with comments | « net/base/mac/url_conversions_unittest.mm ('k') | net/net.gypi » ('j') | no next file with comments »