StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs

Browse Source 
Test: build / treehugger
Bug: 146727827
Exempt-From-Owner-Approval: Cherry-picking from goog/master to aosp/master
Merged-in: Ia6a1c3a795ceb168f0f478a50e5e2415d6a92ba4
Change-Id: Ia6a1c3a795ceb168f0f478a50e5e2415d6a92ba4
This commit is contained in:
Makoto Onuki
2020-07-10 13:32:56 -07:00
parent 3058878cc7
commit d92d515048
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk_library.go
View File

@@ -143,6 +143,7 @@ type apiScope struct {
droidstubsArgsForGeneratingApi []string droidstubsArgsForGeneratingApi []string
// True if the stubs source and api can be created by the same metalava invocation. // 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 createStubsSourceAndApiTogether bool
// Whether the api scope can be treated as unstable, and should skip compat checks. // Whether the api scope can be treated as unstable, and should skip compat checks.
@@ -284,6 +285,7 @@ var (
sdkVersion: "module_current", sdkVersion: "module_current",
droidstubsArgs: []string{ droidstubsArgs: []string{
"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\)", "--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{ apiScopeSystemServer = initApiScope(&apiScope{