Split android-non-updatable-stubs-defaults in two
Put the module classpath defaults into a separate defaults module,
such that users can choose to add the module symbols in a different
way.
Update all the current users to apply both defaults.
Test: m nothing
Change-Id: I22f9518c2e205bfa8ad8d4b630ec976921786b73
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 8f35d3d..9e8b707 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -29,7 +29,10 @@
droidstubs {
name: "api-stubs-docs-non-updatable",
- defaults: ["android-non-updatable-stubs-defaults"],
+ defaults: [
+ "android-non-updatable-stubs-defaults",
+ "module-classpath-stubs-defaults",
+ ],
args: metalava_framework_docs_args,
check_api: {
current: {
@@ -78,7 +81,10 @@
droidstubs {
name: "system-api-stubs-docs-non-updatable",
- defaults: ["android-non-updatable-stubs-defaults"],
+ defaults: [
+ "android-non-updatable-stubs-defaults",
+ "module-classpath-stubs-defaults",
+ ],
args: metalava_framework_docs_args + priv_apps,
check_api: {
current: {
@@ -114,7 +120,10 @@
droidstubs {
name: "test-api-stubs-docs-non-updatable",
- defaults: ["android-non-updatable-stubs-defaults"],
+ defaults: [
+ "android-non-updatable-stubs-defaults",
+ "module-classpath-stubs-defaults",
+ ],
args: metalava_framework_docs_args + test + priv_apps_in_stubs,
check_api: {
current: {
@@ -156,7 +165,10 @@
droidstubs {
name: "module-lib-api-stubs-docs-non-updatable",
- defaults: ["android-non-updatable-stubs-defaults"],
+ defaults: [
+ "android-non-updatable-stubs-defaults",
+ "module-classpath-stubs-defaults",
+ ],
args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,
check_api: {
current: {