diff options
| author | 2020-07-22 09:59:22 +0000 | |
|---|---|---|
| committer | 2020-07-22 09:59:22 +0000 | |
| commit | 83dff5f96e68d3853cc96804279c935fe7a389af (patch) | |
| tree | db6f9611dd18dc7b5cd1e46a411fa5dc72bf66eb | |
| parent | b3267698090e661fa5c6bde73511c6e021f9a052 (diff) | |
| parent | b897b0b7b6c844621f3809de631b64bcdef9f487 (diff) | |
Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am: c9de0dd4e2 am: b897b0b7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202891
Change-Id: I81462520beba79156f872034091796dc6e73864b
| -rw-r--r-- | StubLibraries.bp | 49 | ||||
| -rw-r--r-- | services/Android.bp | 4 |
2 files changed, 50 insertions, 3 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index a9e6e5af47f1..6b989951d331 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -311,6 +311,15 @@ 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" ], @@ -345,7 +354,21 @@ 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"], + 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", + }, + ], } java_library_static { @@ -375,14 +398,34 @@ java_library_static { name: "android_test_stubs_current", srcs: [ ":test-api-stubs-docs" ], static_libs: [ "private-stub-annotations-jar" ], - defaults: ["android_defaults_stubs_current"], + 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", + }, + ], } java_library_static { name: "android_module_lib_stubs_current", srcs: [ ":module-lib-api-stubs-docs-non-updatable" ], - defaults: ["android_defaults_stubs_current"], + defaults: [ + "android_defaults_stubs_current", + "android_stubs_dists_default", + ], 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 40b925de95d6..f0144ac1c695 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -154,10 +154,14 @@ 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", + }, } |