StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable from-text stub generation in non-sdk java_sdk_library" into main am: 99417ba9ea am: 696cea31d3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983176

Change-Id: I298312e534e440f607bff40cc9ceae788edba9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-06 10:33:22 +00:00
committed by Automerger Merge Worker
parent d5db12db6e 696cea31d3
commit 043401d91e
8 changed files with 131 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/testing.go
View File

@@ -487,21 +487,17 @@ func gatherRequiredDepsForTest() string {
}
extraApiLibraryModules := map[string]droidstubsStruct{
"android_stubs_current.from-text": publicDroidstubs,
"android_system_stubs_current.from-text": systemDroidstubs,
"android_test_stubs_current.from-text": testDroidstubs,
"android_module_lib_stubs_current.from-text": moduleLibDroidstubs,
"android_module_lib_stubs_current_full.from-text": moduleLibDroidstubs,
"android_system_server_stubs_current.from-text": systemServerDroidstubs,
"core.current.stubs.from-text": publicDroidstubs,
"legacy.core.platform.api.stubs.from-text": publicDroidstubs,
"stable.core.platform.api.stubs.from-text": publicDroidstubs,
"core-lambda-stubs.from-text": publicDroidstubs,
"android-non-updatable.stubs.from-text": publicDroidstubs,
"android-non-updatable.stubs.system.from-text": systemDroidstubs,
"android-non-updatable.stubs.test.from-text": testDroidstubs,
"android-non-updatable.stubs.module_lib.from-text": moduleLibDroidstubs,
"android-non-updatable.stubs.test_module_lib": moduleLibDroidstubs,
"android_stubs_current.from-text": publicDroidstubs,
"android_system_stubs_current.from-text": systemDroidstubs,
"android_test_stubs_current.from-text": testDroidstubs,
"android_module_lib_stubs_current.from-text": moduleLibDroidstubs,
"android_module_lib_stubs_current_full.from-text": moduleLibDroidstubs,
"android_system_server_stubs_current.from-text": systemServerDroidstubs,
"core.current.stubs.from-text": publicDroidstubs,
"legacy.core.platform.api.stubs.from-text": publicDroidstubs,
"stable.core.platform.api.stubs.from-text": publicDroidstubs,
"core-lambda-stubs.from-text": publicDroidstubs,
"android-non-updatable.stubs.test_module_lib": moduleLibDroidstubs,
}
for _, droidstubs := range droidstubsStructs {
@@ -530,6 +526,8 @@ func gatherRequiredDepsForTest() string {
name: "%s",
api_contributions: ["%s"],
stubs_type: "everything",
sdk_version: "none",
system_modules: "none",
}
`, libName, droidstubs.name+".api.contribution")
}