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

Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main

Browse source
This commit is contained in:
Motomu Utsumi 2023-11-22 14:22:04 +00:00 • committed by Gerrit Code Review
commit d3d41ac7a4
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
framework/Android.bp
View file

@ -268,7 +268,7 @@ java_genrule {
":framework-connectivity-t-pre-jarjar{.jar}",
":framework-connectivity.stubs.module_lib{.jar}",
":framework-connectivity-t.stubs.module_lib{.jar}",
":framework-connectivity-flagged-apis{.jar}",
":framework-connectivity-module-api-stubs-including-flagged{.jar}",
"jarjar-excludes.txt",
],
tools: [
@ -281,7 +281,7 @@ java_genrule {
"--prefix android.net.connectivity " +
"--apistubs $(location :framework-connectivity.stubs.module_lib{.jar}) " +
"--apistubs $(location :framework-connectivity-t.stubs.module_lib{.jar}) " +
"--apistubs $(location :framework-connectivity-flagged-apis{.jar}) " +
"--apistubs $(location :framework-connectivity-module-api-stubs-including-flagged{.jar}) " +
// Make a ":"-separated list. There will be an extra ":" but empty items are ignored.
"--unsupportedapi $$(printf ':%s' $(locations :connectivity-hiddenapi-files)) " +
"--excludes $(location jarjar-excludes.txt) " +
@ -294,7 +294,7 @@ java_genrule {
}
droidstubs {
name: "framework-connectivity-flagged-apis-droidstubs",
name: "framework-connectivity-module-api-stubs-including-flagged-droidstubs",
srcs: [
":framework-connectivity-sources",
":framework-connectivity-tiramisu-updatable-sources",
@ -302,7 +302,6 @@ droidstubs {
":framework-thread-sources",
],
flags: [
"--show-annotation android.annotation.FlaggedApi",
"--show-for-stub-purposes-annotation android.annotation.SystemApi" +
"\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",
"--show-for-stub-purposes-annotation android.annotation.SystemApi" +
@ -317,8 +316,8 @@ droidstubs {
}
java_library {
name: "framework-connectivity-flagged-apis",
srcs: [":framework-connectivity-flagged-apis-droidstubs"],
name: "framework-connectivity-module-api-stubs-including-flagged",
srcs: [":framework-connectivity-module-api-stubs-including-flagged-droidstubs"],
}
// Library providing limited APIs within the connectivity module, so that R+ components like