Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi-service: Jar-Jar net util sources"

Browse Source
This commit is contained in:
Roshan Pius
2020-01-17 02:04:14 +00:00
committed by Android (Google) Code Review
parent 71d62119df 02432980d0
commit 364042007d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -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",

3
wifi/jarjar-rules.txt
View File

@@ -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