From 84ffba267e16ca776614d6e6960ebee1e2e3122c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 9 Oct 2020 10:13:51 +0100 Subject: Have test_current be a union of system and test APIs Include @SystemApi APIs in the test_current stub jar, while keeping the @TestApi and @SystemApi API txt files tracked separately. A side-effect of this change is that string constants of @SystemApi permissions are no longer inlined in the test api tracking, possibly because metalava was previously incorrectly peeking at @SystemApi whereas it is now explicitly forbidden to do so. I don't believe the API txt change has any practical effects. Bug: 129133308 Test: presubmit Change-Id: I23d3c88624ee7599485c3390a0440b78bc18a0a2 Merged-In: I23d3c88624ee7599485c3390a0440b78bc18a0a2 --- StubLibraries.bp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'StubLibraries.bp') diff --git a/StubLibraries.bp b/StubLibraries.bp index fe84a7ac7715..0c1b342ff5e2 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -231,7 +231,11 @@ droidstubs { arg_files: [ "core/res/AndroidManifest.xml", ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.TestApi", + args: metalava_framework_docs_args + + " --show-annotation android.annotation.TestApi" + + " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" + + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + + "\\)", check_api: { current: { api_file: "api/test-current.txt", -- cgit v1.2.3