diff options
| author | Roshan Pius <rpius@google.com> | 2019-10-16 13:18:43 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-10-17 22:18:49 -0700 |
| commit | 1f5a55fdffb29ed873832b23b3e78e173ece6d5d (patch) | |
| tree | 3c858de74d176234f22b2efa1edc5e4e1f25ddec /service | |
| parent | a9d3efb944214f6e901841c5f01c01980ee3613e (diff) | |
WifiStack: Jar-Jar/include core utilities
These are utilities with no formal API surface. So, jar-jar them to
avoid using the version of these utilities in the system image.
Bug: 142809066
Test: Compiles & wifi stack can connect to networks.
Test: Also ran the appcompat script & ensured that the number of
"android.util" or "com.android.internal.util" @hide dependencies
in WifiStack have reduced (not zero yet)
Change-Id: I81e64f467d80bc324b8a5492caab7075b5484000
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.bp | 1 | ||||
| -rw-r--r-- | service/jarjar-rules-shared.txt | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/service/Android.bp b/service/Android.bp index 3e579d005..ece389432 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -80,6 +80,7 @@ java_library { srcs: [ "java/**/*.java", "java/**/*.logtags", + ":framework-wifistack-shared-srcs", ], libs: [ diff --git a/service/jarjar-rules-shared.txt b/service/jarjar-rules-shared.txt index 706449103..eb843d26d 100644 --- a/service/jarjar-rules-shared.txt +++ b/service/jarjar-rules-shared.txt @@ -1 +1,18 @@ -# TBD +# 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). +rule com.android.internal.util.FastXmlSerializer* com.android.server.wifi.util.FastXmlSerializer@1 +rule com.android.internal.util.HexDump* com.android.server.wifi.util.HexDump@1 +rule com.android.internal.util.IState* com.android.server.wifi.util.IState@1 +rule com.android.internal.util.MessageUtils* com.android.server.wifi.util.MessageUtils@1 +rule com.android.internal.util.Preconditions* com.android.server.wifi.util.Preconditions@1 +rule com.android.internal.util.State* com.android.server.wifi.util.State@1 +rule com.android.internal.util.StateMachine* com.android.server.wifi.util.StateMachine@1 +rule com.android.internal.util.WakeupMessage* com.android.server.wifi.util.WakeupMessage@1 +rule com.android.internal.util.XmlUtils* com.android.server.wifi.util.XmlUtils@1 + +rule android.util.KeyValueListParser* com.android.server.wifi.util.KeyValueListParser@1 +rule android.util.LocalLog* com.android.server.wifi.util.LocalLog@1 +rule android.util.Rational* com.android.server.wifi.util.Rational@1 +rule android.util.proto.ProtoStream* com.android.server.wifi.util.proto.ProtoStream@1 +rule android.util.proto.ProtoOutputStream* com.android.server.wifi.util.proto.ProtoOutputStream@1 |