net/net.gyp - Issue 10206014: Upstream Android proxy config service.

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 10206014: Upstream Android proxy config service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Ryan and Yaron's comments Created 8 years, 7 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

« base/android/jni_generator/jni_generator.py ('K') | « net/android/tools/proxy_test_cases.py ('k') | net/proxy/proxy_config_service_android.h » ('j') | net/proxy/proxy_config_service_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/net.gyp

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

index a78e5ed126bb71732b7fa10dbe264b1287857fd9..ae92d718371c0f36e41f187b583f75f40a901247 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -551,6 +551,8 @@

'proxy/proxy_config.cc',

'proxy/proxy_config.h',

'proxy/proxy_config_service.h',

+ 'proxy/proxy_config_service_android.cc',

+ 'proxy/proxy_config_service_android.h',

'proxy/proxy_config_service_fixed.cc',

'proxy/proxy_config_service_fixed.h',

'proxy/proxy_config_service_linux.cc',

@@ -1168,8 +1170,8 @@

'http/mock_gssapi_library_posix.h',

'http/mock_http_cache.cc',

'http/mock_http_cache.h',

- 'http/mock_sspi_library_win.h',

'http/mock_sspi_library_win.cc',

+ 'http/mock_sspi_library_win.h',

'http/url_security_manager_unittest.cc',

'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc',

'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc',

@@ -1177,6 +1179,7 @@

'proxy/multi_threaded_proxy_resolver_unittest.cc',

'proxy/network_delegate_error_observer_unittest.cc',

'proxy/proxy_bypass_rules_unittest.cc',

+ 'proxy/proxy_config_service_android_unittest.cc',

'proxy/proxy_config_service_linux_unittest.cc',

'proxy/proxy_config_service_win_unittest.cc',

'proxy/proxy_config_unittest.cc',

@@ -1804,10 +1807,12 @@

'java_sources': [

'android/java/org/chromium/net/AndroidNetworkLibrary.java',

'android/java/org/chromium/net/NetworkChangeNotifier.java',

+ 'android/java/org/chromium/net/ProxyChangeListener.java',

'jni_headers': [

'<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',

+ '<(SHARED_INTERMEDIATE_DIR)/net/jni/proxy_change_listener_jni.h',

'includes': [ '../build/jni_generator.gypi' ],