diff options
| author | Roshan Pius <rpius@google.com> | 2020-04-09 09:47:40 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2020-04-10 05:14:03 +0000 |
| commit | 5a283f2d9db8cf76683bb395eceaa6cb93066822 (patch) | |
| tree | 17fa95677ea3c794ce4483347d4dbe51ad71bdd9 /wifi | |
| parent | dedd760e363d8767811827fbc75f77f4c58f2132 (diff) | |
wifi(jar-jar): Jar-jar all static dependencies
Bug: 153596226
Test: Device boots up and connects to wifi networks.
Test: Manual inspection of classes included in framework-wifi &
service-wifi using dexdump
Change-Id: Ic31cdae62761110eeb4834a588b36328de19adb8
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/jarjar-rules.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index cf11f4347503..f0333c98b8a7 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -10,11 +10,17 @@ rule android.net.NetworkFactory* com.android.server.x.wifi.net.NetworkFactory@1 rule android.net.ip.IpClientCallbacks* com.android.server.x.wifi.net.ip.IpClientCallbacks@1 rule android.net.ip.IpClientManager* com.android.server.x.wifi.net.ip.IpClientManager@1 rule android.net.ip.IpClientUtil* com.android.server.x.wifi.net.ip.IpClientUtil@1 +rule android.net.ipmemorystore.OnBlobRetrievedListener* com.android.server.x.wifi.net.ipmemorystore.OnBlobRetrievedListener@1 +rule android.net.ipmemorystore.OnStatusListener* com.android.server.x.wifi.net.ipmemorystore.OnStatusListener@1 +rule android.net.ipmemorystore.StatusParcelable* @0 +rule android.net.ipmemorystore.Status* com.android.server.x.wifi.net.ipmemorystore.Status@1 +rule android.net.networkstack.ModuleNetworkStackClient* com.android.server.x.wifi.net.networkstack.ModuleNetworkStackClient@1 +rule android.net.networkstack.NetworkStackClientBase* com.android.server.x.wifi.net.networkstack.NetworkStackClientBase@1 rule android.net.shared.InetAddressUtils* com.android.server.x.wifi.net.shared.InetAddressUtils@1 rule android.net.shared.InitialConfiguration* com.android.server.x.wifi.net.shared.InitialConfiguration@1 rule android.net.shared.IpConfigurationParcelableUtil* com.android.server.x.wifi.net.shared.IpConfigurationParcelableUtil@1 +rule android.net.shared.Layer2Information* com.android.server.x.wifi.net.shared.Layer2Information@1 rule android.net.shared.LinkPropertiesParcelableUtil* com.android.server.x.wifi.net.shared.LinkPropertiesParcelableUtil@1 -rule android.net.shared.ParcelableUtil* com.android.server.x.wifi.net.shared.ParcelableUtil@1 rule android.net.shared.NetdUtils* com.android.server.x.wifi.net.shared.NetdUtils@1 rule android.net.shared.NetworkMonitorUtils* com.android.server.x.wifi.net.shared.NetworkMonitorUtils@1 rule android.net.shared.ParcelableUtil* com.android.server.x.wifi.net.shared.ParcelableUtil@1 @@ -28,6 +34,8 @@ rule android.net.util.SharedLog* com.android.server.x.wifi.net.util.SharedLog@1 rule android.net.util.NetUtils* com.android.server.x.wifi.net.util.NetUtils@1 rule android.net.util.IpUtils* com.android.server.x.wifi.net.util.IpUtils@1 +rule androidx.annotation.** com.android.server.x.wifi.androidx.annotation.@1 + # We don't jar-jar the entire package because, we still use some classes (like # AsyncChannel in com.android.internal.util) from these packages which are not # inside our jar (currently in framework.jar, but will be in wifisdk.jar in the future). @@ -56,6 +64,10 @@ rule android.sysprop.** com.android.server.x.wifi.sysprop.@1 # Use our statically linked HIDL stubs rule android.hardware.** com.android.server.x.wifi.hardware.@1 rule android.hidl.** com.android.server.x.wifi.hidl.@1 +# Use our statically linked ksoap2 +rule org.ksoap2.** com.android.server.x.wifi.ksoap2.@1 +# Use our statically linked nanohttpd +rule fi.iki.elonen.** com.android.server.x.wifi.elonen.@1 # used by both framework-wifi and wifi-service rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParceledListSlice@1 |