Upstream Android proxy config service.

net/net.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 531 matching lines @@
         'proxy/multi_threaded_proxy_resolver.h',
         'proxy/network_delegate_error_observer.cc',
         'proxy/network_delegate_error_observer.h',
         'proxy/polling_proxy_config_service.cc',
         'proxy/polling_proxy_config_service.h',
         'proxy/proxy_bypass_rules.cc',
         'proxy/proxy_bypass_rules.h',
         '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',
         'proxy/proxy_config_service_linux.h',
         'proxy/proxy_config_service_mac.cc',
         'proxy/proxy_config_service_mac.h',
         'proxy/proxy_config_service_win.cc',
         'proxy/proxy_config_service_win.h',
         'proxy/proxy_info.cc',
         'proxy/proxy_info.h',
@@ skipping 617 matching lines @@
         'proxy/proxy_config_service_win_unittest.cc',
         'proxy/proxy_config_unittest.cc',
         'proxy/proxy_list_unittest.cc',
         'proxy/proxy_resolver_js_bindings_unittest.cc',
         'proxy/proxy_resolver_v8_unittest.cc',
         'proxy/proxy_script_decider_unittest.cc',
         'proxy/proxy_script_fetcher_impl_unittest.cc',
         'proxy/proxy_server_unittest.cc',
         'proxy/proxy_service_unittest.cc',
         'proxy/sync_host_resolver_bridge_unittest.cc',
+        'proxy/proxy_config_service_android_unittest.cc',

[Ryan Sleevi, 2012/04/24 18:20:04]

nit: sort

[Philippe, 2012/05/09 11:48:39]

Done.

         'socket/buffered_write_stream_socket_unittest.cc',
         'socket/client_socket_pool_base_unittest.cc',
         'socket/deterministic_socket_data_unittest.cc',
         'socket/mock_client_socket_pool_manager.cc',
         'socket/mock_client_socket_pool_manager.h',
         'socket/socks5_client_socket_unittest.cc',
         'socket/socks_client_socket_pool_unittest.cc',
         'socket/socks_client_socket_unittest.cc',
         'socket/ssl_client_socket_pool_unittest.cc',
         'socket/ssl_client_socket_unittest.cc',
@@ skipping 596 matching lines @@
      }],
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'net_jni_headers',
           'type': 'none',
           'variables': {
             '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' ],
         },
         {
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
             'package_name': 'net',
             'java_in_dir': '../net/android/java',
@@ skipping 25 matching lines @@
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
           ],
         },
       ],
     }],
   ],
 }