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`
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
This commit is contained in:
@@ -311,6 +311,15 @@ java_defaults {
|
|||||||
compile_dex: true,
|
compile_dex: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java_defaults {
|
||||||
|
name: "android_stubs_dists_default",
|
||||||
|
dist: {
|
||||||
|
targets: ["sdk", "win_sdk"],
|
||||||
|
tag: ".jar",
|
||||||
|
dest: "android.jar",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
java_library_static {
|
java_library_static {
|
||||||
name: "android_monolith_stubs_current",
|
name: "android_monolith_stubs_current",
|
||||||
srcs: [ ":api-stubs-docs" ],
|
srcs: [ ":api-stubs-docs" ],
|
||||||
@@ -345,7 +354,21 @@ java_library_static {
|
|||||||
name: "android_system_monolith_stubs_current",
|
name: "android_system_monolith_stubs_current",
|
||||||
srcs: [ ":system-api-stubs-docs" ],
|
srcs: [ ":system-api-stubs-docs" ],
|
||||||
static_libs: [ "private-stub-annotations-jar" ],
|
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 {
|
java_library_static {
|
||||||
@@ -375,14 +398,34 @@ java_library_static {
|
|||||||
name: "android_test_stubs_current",
|
name: "android_test_stubs_current",
|
||||||
srcs: [ ":test-api-stubs-docs" ],
|
srcs: [ ":test-api-stubs-docs" ],
|
||||||
static_libs: [ "private-stub-annotations-jar" ],
|
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 {
|
java_library_static {
|
||||||
name: "android_module_lib_stubs_current",
|
name: "android_module_lib_stubs_current",
|
||||||
srcs: [ ":module-lib-api-stubs-docs-non-updatable" ],
|
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"],
|
libs: ["sdk_system_29_android"],
|
||||||
|
dist: {
|
||||||
|
dir: "apistubs/android/module-lib",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
java_library_static {
|
java_library_static {
|
||||||
|
|||||||
@@ -154,10 +154,14 @@ droidstubs {
|
|||||||
|
|
||||||
java_library {
|
java_library {
|
||||||
name: "android_system_server_stubs_current",
|
name: "android_system_server_stubs_current",
|
||||||
|
defaults: ["android_stubs_dists_default"],
|
||||||
srcs: [":services-stubs.sources"],
|
srcs: [":services-stubs.sources"],
|
||||||
installable: false,
|
installable: false,
|
||||||
static_libs: ["android_module_lib_stubs_current"],
|
static_libs: ["android_module_lib_stubs_current"],
|
||||||
sdk_version: "none",
|
sdk_version: "none",
|
||||||
system_modules: "none",
|
system_modules: "none",
|
||||||
java_version: "1.8",
|
java_version: "1.8",
|
||||||
|
dist: {
|
||||||
|
dir: "apistubs/android/system-server",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user