diff options
| author | 2020-01-17 02:04:14 +0000 | |
|---|---|---|
| committer | 2020-01-17 02:04:14 +0000 | |
| commit | 364042007d440550f1508ef1e20e6a0dde9f9dc0 (patch) | |
| tree | 0ebcf6e6ec2cd83746f6b76de3decf028195eee8 | |
| parent | 71d62119dffa9c898ce4adfa015dc9edcb7cb4b6 (diff) | |
| parent | 02432980d0430daf6334271042ea317e427ead11 (diff) | |
Merge "wifi-service: Jar-Jar net util sources"
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | wifi/jarjar-rules.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index b3faef1050f6..0e3d374e7662 100644 --- a/Android.bp +++ b/Android.bp @@ -1189,6 +1189,7 @@ java_library { "core/java/com/android/internal/util/Protocol.java", "core/java/com/android/internal/util/Preconditions.java", "telephony/java/android/telephony/Annotation.java", + ":net-utils-framework-wifi-common-srcs", ], libs: [ "framework-annotations-lib", diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index 8f720407f4d7..d377ee69cade 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -1,5 +1,7 @@ rule android.net.InterfaceConfigurationParcel* @0 rule android.net.InterfaceConfiguration* com.android.server.x.wifi.net.InterfaceConfiguration@1 +rule android.net.NetworkFactory* com.android.server.x.wifi.net.NetworkFactory@1 +rule android.net.util.NetUtils* com.android.server.x.wifi.net.util.NetUtils@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 @@ -32,6 +34,7 @@ rule android.sysprop.** com.android.server.x.wifi.sysprop.@1 rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParceledListSlice@1 rule android.content.pm.ParceledListSlice* android.x.net.wifi.util.ParceledListSlice@1 rule android.net.shared.Inet4AddressUtils* android.x.net.wifi.util.Inet4AddressUtils@1 +rule android.net.util.MacAddressUtils* android.x.net.wifi.util.MacAddressUtils@1 rule android.os.HandlerExecutor* android.x.net.wifi.util.HandlerExecutor@1 rule android.telephony.Annotation* android.x.net.wifi.util.TelephonyAnnotation@1 rule com.android.internal.util.AsyncChannel* android.x.net.wifi.util.AsyncChannel@1 |