diff options
author | 2023-04-04 22:04:43 +0000 | |
---|---|---|
committer | 2023-04-04 22:52:37 +0000 | |
commit | c0a24205a78b78c0b0d888f2167732ae923c6634 (patch) | |
tree | 92b4c640ecf2d5956fb6e8213c9228d11b30344e /java/testing.go | |
parent | f590058fd2e87331dd701703763beba158d0929c (diff) |
Update java_api_library in testing modules
The full api surface java_api_library modules are currently defined as
java_library modules instead of java_api_library modules. This change
corrects this and modifies the DepsInfo of java_api_library so that it
can be compatible in tests.
Test: go ./java
Change-Id: I540b5a930f506ce5f7663ab6e07c6df49af15cf9
Diffstat (limited to 'java/testing.go')
-rw-r--r-- | java/testing.go | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/java/testing.go b/java/testing.go index 8a0db9cb1..0764d264a 100644 --- a/java/testing.go +++ b/java/testing.go @@ -368,14 +368,6 @@ func gatherRequiredDepsForTest() string { "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs", - "android_stubs_current.from-text", - "android_system_stubs_current.from-text", - "android_test_stubs_current.from-text", - "android_module_lib_stubs_current.from-text", - "android_system_server_stubs_current.from-text", - "core.current.stubs.from-text", - "legacy.core.platform.api.stubs.from-text", - "stable.core.platform.api.stubs.from-text", "kotlin-stdlib", "kotlin-stdlib-jdk7", @@ -396,6 +388,27 @@ func gatherRequiredDepsForTest() string { `, extra) } + extraApiLibraryModules := map[string]string{ + "android_stubs_current.from-text": "api/current.txt", + "android_system_stubs_current.from-text": "api/system-current.txt", + "android_test_stubs_current.from-text": "api/test-current.txt", + "android_module_lib_stubs_current.from-text": "api/module-lib-current.txt", + "android_system_server_stubs_current.from-text": "api/system-server-current.txt", + "core.current.stubs.from-text": "api/current.txt", + "legacy.core.platform.api.stubs.from-text": "api/current.txt", + "stable.core.platform.api.stubs.from-text": "api/current.txt", + "core-lambda-stubs.from-text": "api/current.txt", + } + + for libName, apiFile := range extraApiLibraryModules { + bp += fmt.Sprintf(` + java_api_library { + name: "%s", + api_files: ["%s"], + } + `, libName, apiFile) + } + bp += ` java_library { name: "framework", |