diff options
| author | 2022-01-24 14:22:35 +0000 | |
|---|---|---|
| committer | 2022-01-24 14:22:35 +0000 | |
| commit | fc0236b17f7ec56f663497b49a98ecc6d5942d78 (patch) | |
| tree | 4fd68d3cc7d549479faced798f16be2207d2a6a4 | |
| parent | 4e38ab22c6ff46af3470e81822fdfff7be6cf6a5 (diff) | |
| parent | 5c5e6cbf803b7696cffab20f25ff0e33cd9fbed1 (diff) | |
Merge "Remove defaults that add nothing" am: 4c11ce8ee3 am: f8319bd662 am: 5c5e6cbf80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384
Change-Id: Ia2b44bc5e0b5afbaac4708ebc6b8eb0f26a57f83
| -rw-r--r-- | StubLibraries.bp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 2ce37921715e..8f35d3d6caec 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -24,23 +24,12 @@ // 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 ///////////////////////////////////////////////////////////////////// droidstubs { name: "api-stubs-docs-non-updatable", - defaults: ["metalava-non-updatable-api-stubs-default"], + defaults: ["android-non-updatable-stubs-defaults"], args: metalava_framework_docs_args, check_api: { current: { @@ -89,7 +78,7 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" + droidstubs { 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, check_api: { current: { @@ -125,7 +114,7 @@ droidstubs { droidstubs { 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, check_api: { current: { @@ -167,7 +156,7 @@ droidstubs { droidstubs { 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, check_api: { current: { |