libs(net/common): Create filegroups for wifi sources
Safer for wifi to just include the sources that it needs. Then there is
no accidental risk of un-jar-jar'ed classes showing up in it's
namespace.
Bug: 135998869
Test: Compiles
Merged-In: I2532f640fbebd4ca82be7bbb63744bcad653ac34
Change-Id: I2532f640fbebd4ca82be7bbb63744bcad653ac34
(clean cherry-pick from internal branch)
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 2c707ab..6827403 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -41,7 +41,6 @@
jarjar_rules: "jarjar-rules-shared.txt",
visibility: [
"//frameworks/base/packages/Tethering",
- "//frameworks/opt/net/wifi",
"//frameworks/opt/net/ike",
"//frameworks/opt/telephony",
"//packages/modules/NetworkStack",
@@ -59,7 +58,6 @@
visibility: [
"//frameworks/base/services/net",
"//frameworks/base/packages/Tethering",
- "//frameworks/opt/net/wifi/service",
"//frameworks/opt/net/ike",
"//packages/modules/NetworkStack",
"//packages/modules/CaptivePortalLogin",
@@ -78,3 +76,30 @@
"//frameworks/opt/telephony",
],
}
+
+// Use a filegroup and not a library for wifi sources, as this needs corresponding jar-jar
+// rules on the wifi side.
+// Any class here *must* have a corresponding jarjar rule in the wifi build rules.
+filegroup {
+ name: "net-utils-framework-wifi-common-srcs",
+ srcs: [
+ "src_frameworkcommon/android/net/util/MacAddressUtils.java",
+ ],
+ visibility: [
+ "//frameworks/base",
+ ],
+}
+
+// Use a filegroup and not a library for wifi sources, as this needs corresponding jar-jar
+// rules on the wifi side.
+// Any class here *must* have a corresponding jarjar rule in the wifi build rules.
+filegroup {
+ name: "net-utils-wifi-service-common-srcs",
+ srcs: [
+ "src_frameworkcommon/android/net/util/NetUtils.java",
+ "src_servicescommon/android/net/NetworkFactory.java",
+ ],
+ visibility: [
+ "//frameworks/opt/net/wifi/service",
+ ],
+}