diff options
| author | 2020-08-11 14:22:10 +0000 | |
|---|---|---|
| committer | 2020-08-11 14:22:10 +0000 | |
| commit | ef59d8ff005184f99e3d3849e608573756ae25cb (patch) | |
| tree | b5d68a538e2c0c37360aa958dd129a10555e11b9 | |
| parent | 2f5ebc895b446ed6ef80e2962a4517cd43104a1b (diff) | |
| parent | 9b0a74f0a3ae653954f432bf8892533aa2522015 (diff) | |
Revert "Add bp-based disting of android stubs" am: 9b0a74f0a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346268
Change-Id: I00bcb2a295570e7d99747e104fa866d5c50f2c2a
| -rw-r--r-- | StubLibraries.bp | 49 | ||||
| -rw-r--r-- | services/Android.bp | 4 |
2 files changed, 3 insertions, 50 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 6b989951d331..a9e6e5af47f1 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -311,15 +311,6 @@ java_defaults { compile_dex: true, } -java_defaults { - name: "android_stubs_dists_default", - dist: { - targets: ["sdk", "win_sdk"], - tag: ".jar", - dest: "android.jar", - }, -} - java_library_static { name: "android_monolith_stubs_current", srcs: [ ":api-stubs-docs" ], @@ -354,21 +345,7 @@ java_library_static { name: "android_system_monolith_stubs_current", srcs: [ ":system-api-stubs-docs" ], static_libs: [ "private-stub-annotations-jar" ], - defaults: [ - "android_defaults_stubs_current", - "android_stubs_dists_default", - ], - dist: { - dir: "apistubs/android/system", - }, - dists: [ - { - // Legacy dist path - targets: ["sdk", "win_sdk"], - tag: ".jar", - dest: "android_system.jar", - }, - ], + defaults: ["android_defaults_stubs_current"], } java_library_static { @@ -398,34 +375,14 @@ java_library_static { name: "android_test_stubs_current", srcs: [ ":test-api-stubs-docs" ], static_libs: [ "private-stub-annotations-jar" ], - defaults: [ - "android_defaults_stubs_current", - "android_stubs_dists_default", - ], - dist: { - dir: "apistubs/android/test", - }, - dists: [ - { - // Legacy dist path - targets: ["sdk", "win_sdk"], - tag: ".jar", - dest: "android_test.jar", - }, - ], + defaults: ["android_defaults_stubs_current"], } java_library_static { name: "android_module_lib_stubs_current", srcs: [ ":module-lib-api-stubs-docs-non-updatable" ], - defaults: [ - "android_defaults_stubs_current", - "android_stubs_dists_default", - ], + defaults: ["android_defaults_stubs_current"], libs: ["sdk_system_29_android"], - dist: { - dir: "apistubs/android/module-lib", - }, } java_library_static { diff --git a/services/Android.bp b/services/Android.bp index f0144ac1c695..40b925de95d6 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -154,14 +154,10 @@ droidstubs { java_library { name: "android_system_server_stubs_current", - defaults: ["android_stubs_dists_default"], srcs: [":services-stubs.sources"], installable: false, static_libs: ["android_module_lib_stubs_current"], sdk_version: "none", system_modules: "none", java_version: "1.8", - dist: { - dir: "apistubs/android/system-server", - }, } |