Merge changes I5f425928,I397d361f

am: e57a8f338f

Change-Id: I972c14da65bd628f4a96e6c2be2ed87d28ed3ce3
This commit is contained in:
Jiyong Park
2020-01-13 08:06:11 -08:00
committed by android-build-merger

View File

@@ -34,6 +34,36 @@ stubs_defaults {
stubs_defaults { stubs_defaults {
name: "framework-module-stubs-defaults-systemapi", name: "framework-module-stubs-defaults-systemapi",
args: mainline_stubs_args + " --show-annotation android.annotation.SystemApi ", args: mainline_stubs_args +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
"process=android.annotation.SystemApi.Process.ALL\\) ",
installable: false,
}
stubs_defaults {
name: "framework-module-stubs-defaults-module_apps_api",
args: mainline_stubs_args +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
"process=android.annotation.SystemApi.Process.ALL\\) " +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.MODULE_APPS," +
"process=android.annotation.SystemApi.Process.ALL\\) ",
installable: false,
}
stubs_defaults {
name: "framework-module-stubs-defaults-module_libs_api",
args: mainline_stubs_args +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS," +
"process=android.annotation.SystemApi.Process.ALL\\) " +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.MODULE_APPS," +
"process=android.annotation.SystemApi.Process.ALL\\) " +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES," +
"process=android.annotation.SystemApi.Process.ALL\\) ",
installable: false, installable: false,
} }