LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main am: d3d41ac7a4 am: ca7d626641

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842795

Change-Id: Icf73a795d8f2c263be9d9fa7c0418c29a1674774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2023-11-22 14:55:44 +00:00
committed by Automerger Merge Worker
parent 15d0035055 ca7d626641
commit f5278bc0ea
2 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-t-pre-jarjar{.jar}",
":framework-connectivity.stubs.module_lib{.jar}", ":framework-connectivity.stubs.module_lib{.jar}",
":framework-connectivity-t.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", "jarjar-excludes.txt",
], ],
tools: [ tools: [
@@ -281,7 +281,7 @@ java_genrule {
"--prefix android.net.connectivity " + "--prefix android.net.connectivity " +
"--apistubs $(location :framework-connectivity.stubs.module_lib{.jar}) " + "--apistubs $(location :framework-connectivity.stubs.module_lib{.jar}) " +
"--apistubs $(location :framework-connectivity-t.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. // Make a ":"-separated list. There will be an extra ":" but empty items are ignored.
"--unsupportedapi $$(printf ':%s' $(locations :connectivity-hiddenapi-files)) " + "--unsupportedapi $$(printf ':%s' $(locations :connectivity-hiddenapi-files)) " +
"--excludes $(location jarjar-excludes.txt) " + "--excludes $(location jarjar-excludes.txt) " +
@@ -294,7 +294,7 @@ java_genrule {
} }
droidstubs { droidstubs {
name: "framework-connectivity-flagged-apis-droidstubs", name: "framework-connectivity-module-api-stubs-including-flagged-droidstubs",
srcs: [ srcs: [
":framework-connectivity-sources", ":framework-connectivity-sources",
":framework-connectivity-tiramisu-updatable-sources", ":framework-connectivity-tiramisu-updatable-sources",
@@ -302,7 +302,6 @@ droidstubs {
":framework-thread-sources", ":framework-thread-sources",
], ],
flags: [ flags: [
"--show-annotation android.annotation.FlaggedApi",
"--show-for-stub-purposes-annotation android.annotation.SystemApi" + "--show-for-stub-purposes-annotation android.annotation.SystemApi" +
"\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)", "\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",
"--show-for-stub-purposes-annotation android.annotation.SystemApi" + "--show-for-stub-purposes-annotation android.annotation.SystemApi" +
@@ -317,8 +316,8 @@ droidstubs {
} }
java_library { java_library {
name: "framework-connectivity-flagged-apis", name: "framework-connectivity-module-api-stubs-including-flagged",
srcs: [":framework-connectivity-flagged-apis-droidstubs"], srcs: [":framework-connectivity-module-api-stubs-including-flagged-droidstubs"],
} }
// Library providing limited APIs within the connectivity module, so that R+ components like // Library providing limited APIs within the connectivity module, so that R+ components like

2
thread/tests/cts/Android.bp
View File

@@ -44,7 +44,7 @@ android_test {
libs: [ libs: [
"android.test.base", "android.test.base",
"android.test.runner", "android.test.runner",
"framework-connectivity-flagged-apis" "framework-connectivity-module-api-stubs-including-flagged"
], ],
// Test coverage system runs on different devices. Need to // Test coverage system runs on different devices. Need to
// compile for all architectures. // compile for all architectures.