diff options
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/Android.bp | 6 | ||||
| -rw-r--r-- | wifi/jarjar-rules.txt | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/wifi/Android.bp b/wifi/Android.bp index 0df578f2216b..9c5b7b66f2a3 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -111,11 +111,6 @@ java_sdk_library { ":framework-wifi-util-lib-aidls", ], - // TODO(b/155480189) - Remove naming_scheme once references have been resolved. - // Temporary java_sdk_library component naming scheme to use to ease the transition from separate - // modules to java_sdk_library. - naming_scheme: "framework-modules", - jarjar_rules: ":wifi-jarjar-rules", installable: true, @@ -140,7 +135,6 @@ java_sdk_library { permitted_packages: [ "android.hardware.wifi", "android.net.wifi", - "android.x.net.wifi", // Created by jarjar rules. "com.android.wifi.x", ], diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index 26927e56d2fa..f0555e6ec93e 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -31,6 +31,7 @@ rule android.net.ip.IIpClient* com.android.wifi.x.@0 rule android.net.ip.IIpClientCallbacks* com.android.wifi.x.@0 rule android.net.ipmemorystore.Blob* com.android.wifi.x.@0 rule android.net.ipmemorystore.IOnBlobRetrievedListener* com.android.wifi.x.@0 +rule android.net.ipmemorystore.IOnStatusAndCountListener* com.android.wifi.x.@0 rule android.net.ipmemorystore.IOnStatusListener* com.android.wifi.x.@0 rule android.net.ipmemorystore.NetworkAttributesParcelable* com.android.wifi.x.@0 rule android.net.ipmemorystore.SameL3NetworkResponseParcelable* com.android.wifi.x.@0 @@ -46,7 +47,9 @@ rule android.net.NetworkFactory* com.android.wifi.x.@0 rule android.net.ip.IpClientCallbacks* com.android.wifi.x.@0 rule android.net.ip.IpClientManager* com.android.wifi.x.@0 rule android.net.ip.IpClientUtil* com.android.wifi.x.@0 +rule android.net.ipmemorystore.NetworkAttributes* com.android.wifi.x.@0 rule android.net.ipmemorystore.OnBlobRetrievedListener* com.android.wifi.x.@0 +rule android.net.ipmemorystore.OnDeleteStatusListener* com.android.wifi.x.@0 rule android.net.ipmemorystore.OnStatusListener* com.android.wifi.x.@0 rule android.net.ipmemorystore.Status* com.android.wifi.x.@0 rule android.net.networkstack.ModuleNetworkStackClient* com.android.wifi.x.@0 |