diff options
| author | Anton Hansson <hansson@google.com> | 2021-04-23 11:41:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 11:41:56 +0000 |
| commit | dda049457b8ee24237274198256d8e79b85bff09 (patch) | |
| tree | 0eddf1a098c5080f8520b6a630533a335ecd1db7 /StubLibraries.bp | |
| parent | 1b2c66567e8ffdf628d2198c3bb4ea841db5f5e9 (diff) | |
| parent | 25adb03255729219cd05603d8bad40f181bb0b4e (diff) | |
Merge "Rename and move stub defaults to modules/common" am: 373a27036b am: 3d7a4355c1 am: 25adb03255
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675888
Change-Id: I0a4eb4cf84973274920b4614f8eac63db38b7551
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 b995f9570ec5..e6f50b7c4210 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -403,16 +403,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: [ @@ -431,7 +421,7 @@ java_library_static { "android-non-updatable.stubs", "private-stub-annotations-jar", ], - defaults: ["android_defaults_stubs_current"], + defaults: ["android.jar_defaults"], } java_library_static { @@ -441,7 +431,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 { "private-stub-annotations-jar", ], defaults: [ - "android_defaults_stubs_current", + "android.jar_defaults", "android_stubs_dists_default", ], dist: { @@ -480,7 +470,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: [ |