Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add bp-based disting of android stubs" am: 6b54515b61

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368436

Change-Id: I7120ce6cc0c235f60476e0cb9bb5362a42f14a65
This commit is contained in:
Anton Hansson
2020-07-22 17:32:13 +00:00
committed by Automerger Merge Worker
parent 6953bc127b 6b54515b61
commit 3f54a52cc3
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
StubLibraries.bp
View File

@@ -299,6 +299,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_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs" ], srcs: [ ":api-stubs-docs" ],
@@ -308,20 +317,54 @@ java_library_static {
java_library_static { java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs" ], 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 { java_library_static {
name: "android_test_stubs_current", name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ], 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 { 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 {

4
services/Android.bp
View File

@@ -140,10 +140,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",
},
} }