diff options
| author | Jason Monk <jmonk@google.com> | 2013-07-03 17:04:33 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2013-08-07 21:01:39 -0400 |
| commit | 602b232a06ede86999aa362a12eb28cbc782dc1d (patch) | |
| tree | 07a2168ba91425f81bd7ac9c9311adb78114cc13 /Android.mk | |
| parent | 55db1e1218971105e68ba9d451b2e0b1e9e5f9fb (diff) | |
| download | frameworks_base-602b232a06ede86999aa362a12eb28cbc782dc1d.zip frameworks_base-602b232a06ede86999aa362a12eb28cbc782dc1d.tar.gz frameworks_base-602b232a06ede86999aa362a12eb28cbc782dc1d.tar.bz2 | |
Add PAC File support for proxy configuration
PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host). It gets called to determine what proxy should be
used for a specific request.
This adds PAC support to the system. The ProxyProperties has been modified
to hold the PAC file when one is present. The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required. This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.
The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.
The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files. The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.
As a fallback to applications that don't use the java ProxySelector, the proxy
is setup to point to a local proxy server that will handle the pac parsing.
bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -257,7 +257,8 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ - wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl + wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ + packages/services/Proxy/com/android/net/IProxyService.aidl \ # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) |