commit 4c11ce8ee3ed25ee4ec38c3497ab87263b557aa2
author Anton Hansson <hansson@google.com> Mon Jan 24 13:56:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 24 13:56:13 2022 +0000
tree 4da915f9d24cfa676be3e2f6963521bbe0ec32cc
parent 3af0c6a106b7bd7589ce64c8ca9c4189c87ad6b5
parent 9592c8bb61d310f18663aea79672f53b5241f3fb

Merge "Remove defaults that add nothing"

StubLibraries.bp

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 2ce3792..8f35d3d 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 @@
 
 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 {
     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 {
     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: {