diff options
| author | 2024-08-28 23:38:16 +0000 | |
|---|---|---|
| committer | 2024-08-28 23:38:16 +0000 | |
| commit | 523efd1db1a77fac7e74a13372e839dab3f68d1b (patch) | |
| tree | 27408324b91f6ea39038a81b1e9f15a8f1c0540c /java/testing.go | |
| parent | 3d1e2aa430fc8acd0597eb02a72e80624c1e7820 (diff) | |
| parent | c2ba6683c5bfaae5906c984f2dd7bbeacad88e2e (diff) | |
Merge "Revert^3 "Implement detecting container violations."" into main am: 88a8daf8ca am: c2ba6683c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248525
Change-Id: I81f89cb4da10d34d2de5c48093bf43a76b81d769
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, 3 insertions, 5 deletions
diff --git a/java/testing.go b/java/testing.go index b436dfdf6..534e8f46d 100644 --- a/java/testing.go +++ b/java/testing.go @@ -184,10 +184,6 @@ var PrepareForTestWithJacocoInstrumentation = android.GroupFixturePreparers( host_supported: true, srcs: ["Test.java"], sdk_version: "current", - apex_available: [ - "//apex_available:anyapex", - "//apex_available:platform", - ], } `)), ) @@ -412,6 +408,7 @@ 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", @@ -419,11 +416,13 @@ 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", @@ -437,7 +436,6 @@ func gatherRequiredDepsForTest() string { sdk_version: "none", system_modules: "stable-core-platform-api-stubs-system-modules", compile_dex: true, - is_stubs_module: true, } `, extra) } |