From e4f34886916e5ef36abe8346829dec51020ae0f0 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 14 Nov 2024 12:26:00 -0800
Subject: Don't use DirectlyInAnyApex to enable dex and coverage

DirectlyInAnyApex was being used to automatically enable dexing
and to enable coverage.  There is only one module in an apex that
isn't already being dexed, so set compile_dex in that module and
remove the automatic dexing.  Coverage is only useful on device
modules if they are dexed, so convert the shouldInstrumentInApex
test to check if it is dexed instead.

This reomves the last usages of DirectlyInAnyApex from the java
package.

Bug: 372543712
Test: No change to build.ninja
Change-Id: I1d1738305ed97d85669945def75e9916c2b41f3c
---
 java/testing.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java/testing.go')

diff --git a/java/testing.go b/java/testing.go
index 988514dea..cb3245ba7 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -190,6 +190,7 @@ var PrepareForTestWithJacocoInstrumentation = android.GroupFixturePreparers(
 				"//apex_available:anyapex",
 				"//apex_available:platform",
 			],
+			compile_dex: true,
 		}
 	`)),
 )
-- 
cgit v1.2.3-59-g8ed1b