chromeos/chromeos.gyp - Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig

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: chromeos/chromeos.gyp

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use net/ parsing, update OWNERS Created 5 years, 5 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: chromeos/chromeos.gyp

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

index f5b3db082841723ca5bb404e9bae45acb9136f3e..18548aba89986795e5749077b3f283e120f79b80 100644

--- a/chromeos/chromeos.gyp

+++ b/chromeos/chromeos.gyp

@@ -545,6 +545,7 @@

'../components/components.gyp:cloud_policy_proto',

'../components/components.gyp:device_event_log_component',

'../components/components.gyp:onc_component',

+ '../components/components.gyp:proxy_config',

'../crypto/crypto.gyp:crypto',

'../dbus/dbus.gyp:dbus',

'../google_apis/google_apis.gyp:google_apis',

@@ -569,6 +570,7 @@

'type': 'static_library',

'dependencies': [

'../build/linux/system.gyp:dbus',

+ '../google_apis/google_apis.gyp:google_apis_test_support',

jochen (gone - plz use gerrit) 2015/07/08 13:20:15 indent

stevenjb 2015/07/08 16:26:14 huh?

'../testing/gmock.gyp:gmock',

'chromeos',

'chromeos_test_support_without_gmock',

@@ -666,6 +668,7 @@

'../build/linux/system.gyp:dbus',

'../build/linux/system.gyp:ssl',

'../components/components.gyp:onc_component',

+ '../components/components.gyp:proxy_config',

'../crypto/crypto.gyp:crypto',

'../crypto/crypto.gyp:crypto_test_support',

'../dbus/dbus.gyp:dbus_test_support',