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

Add a net-utils-telephony-common library for NetworkFactory.

Browse source 
A separate target is necessary for telephony as it needs to jarjar
included classes.

Test: atest FrameworksNetTests FrameworksWifiTests \
          FrameworksTelephonyTests
Bug: 138306002
Change-Id: I4b7f79fc43fe5820c94226662bee0216b61fc599
Merged-In: I4b7f79fc43fe5820c94226662bee0216b61fc599
(clean cherry-pick from internal branch)
This commit is contained in:
Lorenzo Colitti 2020-01-14 14:47:16 +09:00 • committed by Remi NGUYEN VAN
commit e14bd343e0
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
staticlibs/Android.bp
View file

@ -17,6 +17,11 @@
// library directly.
// 2. The "net-utils-services-common" library is for use by modules and frameworks/base/services.
// It does not need to be jarjared because it is not placed on the bootclasspath.
// 3. The "net-utils-telephony-common-srcs" filegroup is for use specifically by telephony, which
// places many of its classes, even non-API service classes, on the boot classpath. Any file that
// is added to this filegroup *must* have a corresponding jarjar rule in the telephony jarjar
// rules file. Otherwise, it will end up on the boot classpath and other modules will not be able
// to provide their own copy.
filegroup {
name: "net-utils-framework-common-srcs",
@ -26,7 +31,7 @@ filegroup {
java_library {
name: "net-utils-framework-common",
srcs: [":net-utils-framework-common-srcs" ],
srcs: [":net-utils-framework-common-srcs"],
jarjar_rules: "jarjar-rules-shared.txt",
visibility: [
"//frameworks/base/packages/Tethering",
@ -50,3 +55,16 @@ java_library {
"//packages/modules/CaptivePortalLogin",
],
}
// Use a filegroup and not a library for telephony sources, as framework-annotations cannot be
// included either (some annotations would be duplicated on the bootclasspath).
filegroup {
name: "net-utils-telephony-common-srcs",
srcs: [
// Any class here *must* have a corresponding jarjar rule in the telephony build rules.
"src_servicescommon/android/net/NetworkFactory.java",
],
visibility: [
"//frameworks/opt/telephony",
],
}