joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

libs(net/common): Create filegroups for wifi sources

Browse source 
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)
This commit is contained in:
Roshan Pius 2020-01-16 09:19:11 -08:00 • committed by Remi NGUYEN VAN
commit 864bdec16e
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
staticlibs/Android.bp
View file

@ -41,7 +41,6 @@ java_library {
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 @@ java_library {
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 @@ filegroup {
"//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",
],
}