diff options
| author | Anton Hansson <hansson@google.com> | 2021-04-14 18:52:08 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2021-04-22 17:55:55 +0100 |
| commit | 65057af935c46b8805325bdd103b912700f28d13 (patch) | |
| tree | c5139b7a3395b0b02a76e81f789ef1f3ac49b63e /StubLibraries.bp | |
| parent | 6b4ecd94c1ed13a4b11f1cf9e26af500ccbd9cd1 (diff) | |
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
Diffstat (limited to 'StubLibraries.bp')
| -rw-r--r-- | StubLibraries.bp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index d0da5dae2ce3..00d077192a01 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -392,16 +392,6 @@ java_library_static { } 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 @@ java_library_static { "android-non-updatable.stubs", "private-stub-annotations-jar", ], - defaults: ["android_defaults_stubs_current"], + defaults: ["android.jar_defaults"], } java_library_static { @@ -430,7 +420,7 @@ java_library_static { "private-stub-annotations-jar", ], defaults: [ - "android_defaults_stubs_current", + "android.jar_defaults", "android_stubs_dists_default", ], dist: { @@ -458,7 +448,7 @@ java_library_static { "private-stub-annotations-jar", ], defaults: [ - "android_defaults_stubs_current", + "android.jar_defaults", "android_stubs_dists_default", ], dist: { @@ -469,7 +459,7 @@ java_library_static { java_library_static { name: "android_module_lib_stubs_current", defaults: [ - "android_defaults_stubs_current", + "android.jar_defaults", "android_stubs_dists_default", ], static_libs: [ |