Merge "wifi: Jar jar all external dependencies to a singe namespace" into...

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

rule android.net.DhcpResultsParcelable* @0

rule android.net.DhcpResultsParcelable* @0

rule android.net.DhcpResults* com.android.server.x.wifi.net.DhcpResults@1

rule android.net.DhcpResults* com.android.wifi.x.@0

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

rule android.net.InterfaceConfigurationParcel* @0

rule android.net.InterfaceConfigurationParcel* @0

rule android.net.InterfaceConfiguration* com.android.server.x.wifi.net.InterfaceConfiguration@1

rule android.net.InterfaceConfiguration* com.android.wifi.x.@0

rule android.net.IpMemoryStore* com.android.server.x.wifi.net.IpMemoryStore@1

rule android.net.IpMemoryStore* com.android.wifi.x.@0

rule android.net.NetworkMonitorManager* com.android.server.x.wifi.net.NetworkMonitorManager@1

rule android.net.NetworkMonitorManager* com.android.wifi.x.@0

rule android.net.TcpKeepalivePacketData* com.android.server.x.wifi.net.TcpKeepalivePacketData@1

rule android.net.TcpKeepalivePacketData* com.android.wifi.x.@0

rule android.net.NetworkFactory* com.android.server.x.wifi.net.NetworkFactory@1

rule android.net.NetworkFactory* com.android.wifi.x.@0

rule android.net.ip.IpClientCallbacks* com.android.server.x.wifi.net.ip.IpClientCallbacks@1

rule android.net.ip.IpClientCallbacks* com.android.wifi.x.@0

rule android.net.ip.IpClientManager* com.android.server.x.wifi.net.ip.IpClientManager@1

rule android.net.ip.IpClientManager* com.android.wifi.x.@0

rule android.net.ip.IpClientUtil* com.android.server.x.wifi.net.ip.IpClientUtil@1

rule android.net.ip.IpClientUtil* com.android.wifi.x.@0

rule android.net.ipmemorystore.OnBlobRetrievedListener* com.android.server.x.wifi.net.ipmemorystore.OnBlobRetrievedListener@1

rule android.net.ipmemorystore.OnBlobRetrievedListener* com.android.wifi.x.@0

rule android.net.ipmemorystore.OnStatusListener* com.android.server.x.wifi.net.ipmemorystore.OnStatusListener@1

rule android.net.ipmemorystore.OnStatusListener* com.android.wifi.x.@0

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

# Note: This rule is needed to ensure the rule below does not rename a Parcelable (see TODO above).

rule android.net.ipmemorystore.StatusParcelable* @0

rule android.net.ipmemorystore.StatusParcelable* @0

rule android.net.ipmemorystore.Status* com.android.server.x.wifi.net.ipmemorystore.Status@1

rule android.net.ipmemorystore.Status* com.android.wifi.x.@0

rule android.net.networkstack.ModuleNetworkStackClient* com.android.server.x.wifi.net.networkstack.ModuleNetworkStackClient@1

rule android.net.networkstack.ModuleNetworkStackClient* com.android.wifi.x.@0

rule android.net.networkstack.NetworkStackClientBase* com.android.server.x.wifi.net.networkstack.NetworkStackClientBase@1

rule android.net.networkstack.NetworkStackClientBase* com.android.wifi.x.@0

rule android.net.shared.InetAddressUtils* com.android.server.x.wifi.net.shared.InetAddressUtils@1

rule android.net.shared.InetAddressUtils* com.android.wifi.x.@0

rule android.net.shared.InitialConfiguration* com.android.server.x.wifi.net.shared.InitialConfiguration@1

rule android.net.shared.InitialConfiguration* com.android.wifi.x.@0

rule android.net.shared.IpConfigurationParcelableUtil* com.android.server.x.wifi.net.shared.IpConfigurationParcelableUtil@1

rule android.net.shared.IpConfigurationParcelableUtil* com.android.wifi.x.@0

rule android.net.shared.Layer2Information* com.android.server.x.wifi.net.shared.Layer2Information@1

rule android.net.shared.Layer2Information* com.android.wifi.x.@0

rule android.net.shared.LinkPropertiesParcelableUtil* com.android.server.x.wifi.net.shared.LinkPropertiesParcelableUtil@1

rule android.net.shared.LinkPropertiesParcelableUtil* com.android.wifi.x.@0

rule android.net.shared.NetdUtils* com.android.server.x.wifi.net.shared.NetdUtils@1

rule android.net.shared.NetdUtils* com.android.wifi.x.@0

rule android.net.shared.NetworkMonitorUtils* com.android.server.x.wifi.net.shared.NetworkMonitorUtils@1

rule android.net.shared.NetworkMonitorUtils* com.android.wifi.x.@0

rule android.net.shared.ParcelableUtil* com.android.server.x.wifi.net.shared.ParcelableUtil@1

rule android.net.shared.ParcelableUtil* com.android.wifi.x.@0

rule android.net.shared.PrivateDnsConfig* com.android.server.x.wifi.net.shared.PrivateDnsConfig@1

rule android.net.shared.PrivateDnsConfig* com.android.wifi.x.@0

rule android.net.shared.ProvisioningConfiguration* com.android.server.x.wifi.net.shared.ProvisioningConfiguration@1

rule android.net.shared.ProvisioningConfiguration* com.android.wifi.x.@0

rule android.net.shared.RouteUtils* com.android.server.x.wifi.net.shared.RouteUtils@1

rule android.net.shared.RouteUtils* com.android.wifi.x.@0

rule android.net.util.KeepalivePacketDataUtil* com.android.server.x.wifi.net.util.KeepalivePacketDataUtil@1

rule android.net.util.KeepalivePacketDataUtil* com.android.wifi.x.@0

rule android.net.util.NetworkConstants* com.android.server.x.wifi.net.util.NetworkConstants@1

rule android.net.util.NetworkConstants* com.android.wifi.x.@0

rule android.net.util.InterfaceParams* com.android.server.x.wifi.net.util.InterfaceParams@1

rule android.net.util.InterfaceParams* com.android.wifi.x.@0

rule android.net.util.SharedLog* com.android.server.x.wifi.net.util.SharedLog@1

rule android.net.util.SharedLog* com.android.wifi.x.@0

rule android.net.util.NetUtils* com.android.server.x.wifi.net.util.NetUtils@1

rule android.net.util.NetUtils* com.android.wifi.x.@0

rule android.net.util.IpUtils* com.android.server.x.wifi.net.util.IpUtils@1

rule android.net.util.IpUtils* com.android.wifi.x.@0

rule androidx.annotation.** com.android.server.x.wifi.androidx.annotation.@1

rule androidx.annotation.** com.android.wifi.x.@0

# We don't jar-jar the entire package because, we still use some classes (like

# 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

# 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).

# inside our jar (currently in framework.jar, but will be in wifisdk.jar in the future).

rule com.android.internal.util.FastXmlSerializer* com.android.server.x.wifi.util.FastXmlSerializer@1

rule com.android.internal.util.FastXmlSerializer* com.android.wifi.x.@0

rule com.android.internal.util.HexDump* com.android.server.x.wifi.util.HexDump@1

rule com.android.internal.util.HexDump* com.android.wifi.x.@0

rule com.android.internal.util.IState* com.android.server.x.wifi.util.IState@1

rule com.android.internal.util.IState* com.android.wifi.x.@0

rule com.android.internal.util.MessageUtils* com.android.server.x.wifi.util.MessageUtils@1

rule com.android.internal.util.MessageUtils* com.android.wifi.x.@0

rule com.android.internal.util.State* com.android.server.x.wifi.util.State@1

rule com.android.internal.util.State* com.android.wifi.x.@0

rule com.android.internal.util.StateMachine* com.android.server.x.wifi.util.StateMachine@1

rule com.android.internal.util.StateMachine* com.android.wifi.x.@0

rule com.android.internal.util.WakeupMessage* com.android.server.x.wifi.util.WakeupMessage@1

rule com.android.internal.util.WakeupMessage* com.android.wifi.x.@0

rule android.util.BackupUtils* com.android.server.x.wifi.util.BackupUtils@1

rule android.util.BackupUtils* com.android.wifi.x.@0

rule android.util.LocalLog* com.android.server.x.wifi.util.LocalLog@1

rule android.util.LocalLog* com.android.wifi.x.@0

rule android.util.Rational* com.android.server.x.wifi.util.Rational@1

rule android.util.Rational* com.android.wifi.x.@0

rule android.os.BasicShellCommandHandler* com.android.server.x.wifi.os.BasicShellCommandHandler@1

rule android.os.BasicShellCommandHandler* com.android.wifi.x.@0

# Use our statically linked bouncy castle library

# Use our statically linked bouncy castle library

rule org.bouncycastle.** com.android.server.x.wifi.bouncycastle.@1

rule org.bouncycastle.** com.android.wifi.x.@0

# Use our statically linked protobuf library

# Use our statically linked protobuf library

rule com.google.protobuf.** com.android.server.x.wifi.protobuf.@1

rule com.google.protobuf.** com.android.wifi.x.@0

# use statically linked SystemMessageProto

# use statically linked SystemMessageProto

rule com.android.internal.messages.SystemMessageProto* com.android.server.x.wifi.messages.SystemMessageProto@1

rule com.android.internal.messages.SystemMessageProto* com.android.wifi.x.@0

# Use our statically linked PlatformProperties library

# Use our statically linked PlatformProperties library

rule android.sysprop.** com.android.server.x.wifi.sysprop.@1

rule android.sysprop.** com.android.wifi.x.@0

# Use our statically linked HIDL stubs

# Use our statically linked HIDL stubs

# Note: android.hardware.wifi.** is used by various wifi feature flags. This unfortunately is also the namespace

# Note: android.hardware.wifi.** is used by various wifi feature flags. This unfortunately is also the namespace

# used by vendor HAL stubs. So, this rule is intentionally weird to try and filter the vendor HAL stubs only.

# used by vendor HAL stubs. So, this rule is intentionally weird to try and filter the vendor HAL stubs only.

rule android.hardware.wifi.V** com.android.server.x.wifi.hardware.wifi.V@1

rule android.hardware.wifi.V** com.android.wifi.x.@0

rule android.hardware.wifi.supplicant.** com.android.server.x.wifi.hardware.wifi.supplicant.@1

rule android.hardware.wifi.supplicant.** com.android.wifi.x.@0

rule android.hardware.wifi.hostapd.** com.android.server.x.wifi.hardware.wifi.hostapd.@1

rule android.hardware.wifi.hostapd.** com.android.wifi.x.@0

rule android.hidl.** com.android.server.x.wifi.hidl.@1

rule android.hidl.** com.android.wifi.x.@0

# Use our statically linked ksoap2

# Use our statically linked ksoap2

rule org.ksoap2.** com.android.server.x.wifi.ksoap2.@1

rule org.ksoap2.** com.android.wifi.x.@0

# Use our statically linked nanohttpd

# Use our statically linked nanohttpd

rule fi.iki.elonen.** com.android.server.x.wifi.elonen.@1

rule fi.iki.elonen.** com.android.wifi.x.@0

# used by both framework-wifi and wifi-service

# used by both framework-wifi and wifi-service

rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParceledListSlice@1

rule android.content.pm.BaseParceledListSlice* com.android.wifi.x.@0

rule android.content.pm.ParceledListSlice* android.x.net.wifi.util.ParceledListSlice@1

rule android.content.pm.ParceledListSlice* com.android.wifi.x.@0

rule android.net.shared.Inet4AddressUtils* android.x.net.wifi.util.Inet4AddressUtils@1

rule android.net.shared.Inet4AddressUtils* com.android.wifi.x.@0

rule android.net.util.MacAddressUtils* android.x.net.wifi.util.MacAddressUtils@1

rule android.net.util.MacAddressUtils* com.android.wifi.x.@0

rule android.net.util.nsd.DnsSdTxtRecord* android.x.net.wifi.util.nsd.DnsSdTxtRecord@1

rule android.net.util.nsd.DnsSdTxtRecord* com.android.wifi.x.@0

rule android.os.HandlerExecutor* android.x.net.wifi.util.HandlerExecutor@1

rule android.os.HandlerExecutor* com.android.wifi.x.@0

rule android.telephony.Annotation* android.x.net.wifi.util.TelephonyAnnotation@1

rule android.telephony.Annotation* com.android.wifi.x.@0

rule com.android.internal.util.AsyncChannel* android.x.net.wifi.util.AsyncChannel@1

rule com.android.internal.util.AsyncChannel* com.android.wifi.x.@0

rule com.android.internal.util.AsyncService* android.x.net.wifi.util.AsyncService@1

rule com.android.internal.util.AsyncService* com.android.wifi.x.@0

rule com.android.internal.util.Preconditions* android.x.net.wifi.util.Preconditions@1

rule com.android.internal.util.Preconditions* com.android.wifi.x.@0

rule com.android.internal.util.Protocol* android.x.net.wifi.util.Protocol@1

rule com.android.internal.util.Protocol* com.android.wifi.x.@0