From d92d5150485a5b2609cc6d9388041355b7f3ac20 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Fri, 10 Jul 2020 13:32:56 -0700 Subject: [PATCH] Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs Test: build / treehugger Bug: 146727827 Exempt-From-Owner-Approval: Cherry-picking from goog/master to aosp/master Merged-in: Ia6a1c3a795ceb168f0f478a50e5e2415d6a92ba4 Change-Id: Ia6a1c3a795ceb168f0f478a50e5e2415d6a92ba4 --- java/sdk_library.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/sdk_library.go b/java/sdk_library.go index a5aa328d0..58e05e519 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -143,6 +143,7 @@ type apiScope struct { droidstubsArgsForGeneratingApi []string // True if the stubs source and api can be created by the same metalava invocation. + // TODO(b/146727827) Now that metalava supports "API hierarchy", do we still need it? createStubsSourceAndApiTogether bool // Whether the api scope can be treated as unstable, and should skip compat checks. @@ -284,6 +285,7 @@ var ( sdkVersion: "module_current", droidstubsArgs: []string{ "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\)", + "--show-for-stub-purposes-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)", }, }) apiScopeSystemServer = initApiScope(&apiScope{