diff options
| author | 2024-08-28 21:35:16 +0000 | |
|---|---|---|
| committer | 2024-08-28 21:35:16 +0000 | |
| commit | c14be38f1a644a93f89806a8042c50560ff8967b (patch) | |
| tree | 3f3e5bf5d13591cdc8d648476195d5134a141531 /java/testing.go | |
| parent | f5a03c79577c13b732e0580cfaeade99da354bd7 (diff) | |
| parent | 2a88491afc72707c21a125b81f7dcd252d2fc5f1 (diff) | |
Merge changes Ia693c4a5,I8e5620d2 into main
* changes:
Revert^2 "Implement detecting container violations."
Define additional container violations
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) } |