Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "stubs inheriting from framework-module-stubs-defaults-* now works" into rvc-dev am: 55daa202ba

Browse Source 
Change-Id: I2d713997ba5ebf87c74adb86e0248266bdaa897f
This commit is contained in:
Automerger Merge Worker
2020-02-27 03:26:56 +00:00
parent ec01225c09 55daa202ba
commit e9f3ada763
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/Android.bp
View File

@@ -31,12 +31,12 @@ mainline_stubs_args += "--hide-package com.android.server "
priv_apps = " " +
"--show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
"\\) "
module_libs = " " +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +
"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
"\\) "
stubs_defaults {
@@ -48,6 +48,7 @@ stubs_defaults {
stubs_defaults {
name: "framework-module-stubs-defaults-systemapi",
args: mainline_stubs_args + priv_apps,
srcs: [":framework-annotations"],
installable: false,
}
@@ -59,11 +60,13 @@ stubs_defaults {
stubs_defaults {
name: "framework-module-api-defaults-module_libs_api",
args: mainline_stubs_args + module_libs,
srcs: [":framework-annotations"],
installable: false,
}
stubs_defaults {
name: "framework-module-stubs-defaults-module_libs_api",
args: mainline_stubs_args + module_libs + priv_apps,
srcs: [":framework-annotations"],
installable: false,
}