diff options
| author | 2024-08-28 21:43:02 +0000 | |
|---|---|---|
| committer | 2024-08-28 21:43:02 +0000 | |
| commit | 4e373a790458d36d15c795bb56dc8555b822d380 (patch) | |
| tree | d80f4c1561d8f5451869d3ccc013e1da50ec1eb8 /java/testing.go | |
| parent | daf46974b917b7759bdab40528236a379560f045 (diff) | |
| parent | c14be38f1a644a93f89806a8042c50560ff8967b (diff) | |
Merge changes Ia693c4a5,I8e5620d2 into main am: c14be38f1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247222
Change-Id: Id0c06c93eda0e4978d9df052542370f28e64da38
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.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/testing.go b/java/testing.go index 0e85022ce..03dcee667 100644 --- a/java/testing.go +++ b/java/testing.go @@ -184,6 +184,10 @@ var PrepareForTestWithJacocoInstrumentation = android.GroupFixturePreparers( host_supported: true, srcs: ["Test.java"], sdk_version: "current", + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], } `)), ) @@ -408,7 +412,6 @@ func gatherRequiredDepsForTest() string { "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs", - "android_stubs_current_exportable", "android_system_stubs_current_exportable", "android_test_stubs_current_exportable", @@ -416,13 +419,11 @@ func gatherRequiredDepsForTest() string { "android_system_server_stubs_current_exportable", "core.current.stubs.exportable", "legacy.core.platform.api.stubs.exportable", - "kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8", "kotlin-annotations", "stub-annotations", - "aconfig-annotations-lib", "unsupportedappusage", } @@ -435,6 +436,7 @@ func gatherRequiredDepsForTest() string { sdk_version: "none", system_modules: "stable-core-platform-api-stubs-system-modules", compile_dex: true, + is_stubs_module: true, } `, extra) } |