diff options
| author | 2024-08-05 20:51:31 +0000 | |
|---|---|---|
| committer | 2024-08-05 20:51:31 +0000 | |
| commit | f6d9965cc5377e12637404798ff05b619a375b5c (patch) | |
| tree | 093bc4f55be0659740a1d9cdd00927bc263bf569 /java/testing.go | |
| parent | 99417ba9ea1e8ca8fdac449d6c59fa2c5caea54c (diff) | |
| parent | a574cd28a81b7c6493625aebe990aeeaa00319dd (diff) | |
Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/java/testing.go b/java/testing.go index a99baf8a2..7a42e4cce 100644 --- a/java/testing.go +++ b/java/testing.go @@ -486,17 +486,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 { @@ -525,8 +529,6 @@ func gatherRequiredDepsForTest() string { name: "%s", api_contributions: ["%s"], stubs_type: "everything", - sdk_version: "none", - system_modules: "none", } `, libName, droidstubs.name+".api.contribution") } |