Add bp-based disting of android stubs
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.
Bug: 161214753
Test: diff results of `m sdk dist`
Merged-In: Id54507e297b5c57d1ce58f14eb347e7661a5328d
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 26478d3..b999a10 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -299,6 +299,15 @@
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_stubs_current",
srcs: [ ":api-stubs-docs" ],
@@ -308,20 +317,54 @@
java_library_static {
name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs" ],
- 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 {
name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ],
- 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 dc948e9..a8c155c 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -140,10 +140,14 @@
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",
+ },
}