From b2b1ef63e2ee63b137cb71ae2360c111e5d9647f Mon Sep 17 00:00:00 2001
From: Satish Yalla <satishy@google.com>
Date: Wed, 28 Aug 2024 05:10:31 +0000
Subject: Revert "Implement detecting container violations."

This reverts commit bb678f82d6bb5cd89bf282e88a879123d9763d61.

Reason for revert: Droidmonitor created revert due to b/362639013. Will be verifying through ABTD before submission.

Change-Id: I1dcb71672eeb44a17cf176d3731bcaf9aaf81edf
---
 java/testing.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'java/testing.go')

diff --git a/java/testing.go b/java/testing.go
index 03dcee667..0e85022ce 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",
 		"unsupportedappusage",
 	}
@@ -436,7 +435,6 @@ func gatherRequiredDepsForTest() string {
 				sdk_version: "none",
 				system_modules: "stable-core-platform-api-stubs-system-modules",
 				compile_dex: true,
-				is_stubs_module: true,
 			}
 		`, extra)
 	}
-- 
cgit v1.2.3-59-g8ed1b