summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2024-08-06 10:35:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-06 10:35:42 +0000
commit377802211bd6461ff783475016846c6103b003c6 (patch)
treec63cbbde36465c30e40cbba83e9731d0c8373fda /java/testing.go
parent043401d91ed629c6a5c6e8c7a779daa543cdd37a (diff)
parentad5e953a7d0c5e3f5fa5cc80be8d6c42f4618c0e (diff)
Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main am: f6d9965cc5 am: ad5e953a7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207397 Change-Id: I411dc190da40073de7d794de9ad7ef8fd5da9ed3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go28
1 files changed, 15 insertions, 13 deletions
diff --git a/java/testing.go b/java/testing.go
index 8158bb0a1..445e096e6 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -487,17 +487,21 @@ 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.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.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,
}
for _, droidstubs := range droidstubsStructs {
@@ -526,8 +530,6 @@ func gatherRequiredDepsForTest() string {
name: "%s",
api_contributions: ["%s"],
stubs_type: "everything",
- sdk_version: "none",
- system_modules: "none",
}
`, libName, droidstubs.name+".api.contribution")
}