libs(net/common): Fixes for wifi to include
a) Fix the visibility for wifi service.
b) Don't pre jar-jar the utils classes. This makes it hard for the
service to statically link this. The jar-jar should happen in the client
side (i.e wifi service will perform the necessary jar-jar).
Bug: 135998869
Test: Compiles
Change-Id: Ic3b92ca63593394af2003a025508fbb5e2687cfa
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 2c707ab..d3817a9 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -41,7 +41,7 @@
jarjar_rules: "jarjar-rules-shared.txt",
visibility: [
"//frameworks/base/packages/Tethering",
- "//frameworks/opt/net/wifi",
+ "//frameworks/opt/net/wifi/service",
"//frameworks/opt/net/ike",
"//frameworks/opt/telephony",
"//packages/modules/NetworkStack",
diff --git a/staticlibs/jarjar-rules-shared.txt b/staticlibs/jarjar-rules-shared.txt
index b22771d..a7fda7c 100644
--- a/staticlibs/jarjar-rules-shared.txt
+++ b/staticlibs/jarjar-rules-shared.txt
@@ -1,3 +1,2 @@
-rule android.net.util.** com.android.net.module.util.@1
rule android.annotation.** com.android.net.module.annotation.@1
-rule com.android.internal.annotations.** com.android.net.module.annotation.@1
\ No newline at end of file
+rule com.android.internal.annotations.** com.android.net.module.annotation.@1