diff options
| author | 2024-08-30 20:31:34 +0000 | |
|---|---|---|
| committer | 2024-08-30 20:31:34 +0000 | |
| commit | a5a744226bb43377f3bd2e748ef7bea0565bdc1c (patch) | |
| tree | 76ccf6f73983f0db976ef25c2f1f4ac8bff222d9 /java/testing.go | |
| parent | 0ecc6c1d64cb9d233a7e7f3051cc333f224e9dda (diff) | |
| parent | 9e40f8f9b474ec5c259b089bf24052a269dd3d98 (diff) | |
Merge "Revert^4 "Implement detecting container violations."" into main am: 7344482ff3 am: 9e40f8f9b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248019
Change-Id: I77818bede2be74dc6755a55c5a8e69a1c6a7f64c
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 534e8f46d..b436dfdf6 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", "aconfig_storage_reader_java", "unsupportedappusage", @@ -436,6 +437,7 @@ func gatherRequiredDepsForTest() string { sdk_version: "none", system_modules: "stable-core-platform-api-stubs-system-modules", compile_dex: true, + is_stubs_module: true, } `, extra) } |