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

Merge "Remove defaults that add nothing" am: 4c11ce8ee3 am: f8319bd662

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384

Change-Id: I7869d9cad9ac70df5246047cc508da0116f1d981
This commit is contained in:
Anton Hansson
2022-01-24 14:11:55 +00:00
committed by Automerger Merge Worker
parent 1f0a6f7d4e f8319bd662
commit 5c5e6cbf80
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
StubLibraries.bp
View File

@@ -23,24 +23,13 @@
// and comparing them against the checked in API signature, and also checking compatibility // and comparing them against the checked in API signature, and also checking compatibility
// with the latest frozen API signature. // with the latest frozen API signature.
/////////////////////////////////////////////////////////////////////
// Common metalava configs
/////////////////////////////////////////////////////////////////////
stubs_defaults {
name: "metalava-non-updatable-api-stubs-default",
defaults: ["android-non-updatable-stubs-defaults"],
api_levels_annotations_enabled: false,
defaults_visibility: ["//visibility:private"],
}
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// These modules provide source files for the stub libraries // These modules provide source files for the stub libraries
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
droidstubs { droidstubs {
name: "api-stubs-docs-non-updatable", name: "api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"], defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
check_api: { check_api: {
current: { current: {
@@ -89,7 +78,7 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" +
droidstubs { droidstubs {
name: "system-api-stubs-docs-non-updatable", name: "system-api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"], defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + priv_apps, args: metalava_framework_docs_args + priv_apps,
check_api: { check_api: {
current: { current: {
@@ -125,7 +114,7 @@ droidstubs {
droidstubs { droidstubs {
name: "test-api-stubs-docs-non-updatable", name: "test-api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"], defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + test + priv_apps_in_stubs, args: metalava_framework_docs_args + test + priv_apps_in_stubs,
check_api: { check_api: {
current: { current: {
@@ -167,7 +156,7 @@ droidstubs {
droidstubs { droidstubs {
name: "module-lib-api-stubs-docs-non-updatable", name: "module-lib-api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"], defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs, args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,
check_api: { check_api: {
current: { current: {