summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-08-06 18:50:04 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-08-06 18:50:04 +0000
commit4f18cfdd7d1b1b5ad2130e4cf2a2c5c87ba33fb6 (patch)
tree6ceffd677b67757ae1174fbef6393a8733630556 /java/testing.go
parentb320ab283c66c697814c0314b303400b4757e835 (diff)
parentb0f4c0239d4a133fc5021915b47b597b1eaec7ac (diff)
Merge "Revert "Revert "Enable from-text stub generation in non-sdk java..."" into main
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go28
1 files changed, 13 insertions, 15 deletions
diff --git a/java/testing.go b/java/testing.go
index 7a42e4cce..a99baf8a2 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -486,21 +486,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 {
@@ -529,6 +525,8 @@ func gatherRequiredDepsForTest() string {
name: "%s",
api_contributions: ["%s"],
stubs_type: "everything",
+ sdk_version: "none",
+ system_modules: "none",
}
`, libName, droidstubs.name+".api.contribution")
}