Rename and move stub defaults to modules/common
These default need to be used by the module sdk repo, which doesn't
want to depend on frameworks/base. Move the defaults over there, and
give them a more obvious name at the same time.
Bug: 184839225
Test: m nothing
Change-Id: I543a0abad101fbaf2dae7486aadcb2c963842dc4
diff --git a/StubLibraries.bp b/StubLibraries.bp
index d0da5da..00d0771 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -392,16 +392,6 @@
}
java_defaults {
- name: "android_defaults_stubs_current",
- sdk_version: "none",
- system_modules: "none",
- java_version: "1.8",
- compile_dex: true,
- defaults_visibility: ["//visibility:private"],
- visibility: ["//visibility:public"],
-}
-
-java_defaults {
name: "android_stubs_dists_default",
dist: {
targets: [
@@ -420,7 +410,7 @@
"android-non-updatable.stubs",
"private-stub-annotations-jar",
],
- defaults: ["android_defaults_stubs_current"],
+ defaults: ["android.jar_defaults"],
}
java_library_static {
@@ -430,7 +420,7 @@
"private-stub-annotations-jar",
],
defaults: [
- "android_defaults_stubs_current",
+ "android.jar_defaults",
"android_stubs_dists_default",
],
dist: {
@@ -458,7 +448,7 @@
"private-stub-annotations-jar",
],
defaults: [
- "android_defaults_stubs_current",
+ "android.jar_defaults",
"android_stubs_dists_default",
],
dist: {
@@ -469,7 +459,7 @@
java_library_static {
name: "android_module_lib_stubs_current",
defaults: [
- "android_defaults_stubs_current",
+ "android.jar_defaults",
"android_stubs_dists_default",
],
static_libs: [