diff options
| -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 |