Don't emit tests in AndroidMkForFiles

I'm moving the installation of test files to soong. Marking a make
module as a test will make Make start expecting more soong-built test
files. But the apex rules won't generate these files for their
pseudo-modules representing files inside the apex. So instead, just make
those modules not tests.

Bug: 388850000
Test: Presubmits
Change-Id: I9c7d3980beac8d7ad2d758ba99e8ec6895c25f06

1 files changed, 5 insertions, 14 deletions

diff --git a/apex/apex.go b/apex/apex.go
index c6566e13b..a726098c6 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -569,19 +569,6 @@ const (
 	shBinary
 )
 
-var (
-	classes = map[string]apexFileClass{
-		"app":              app,
-		"appSet":           appSet,
-		"etc":              etc,
-		"javaSharedLib":    javaSharedLib,
-		"nativeExecutable": nativeExecutable,
-		"nativeSharedLib":  nativeSharedLib,
-		"nativeTest":       nativeTest,
-		"shBinary":         shBinary,
-	}
-)
-
 // apexFile represents a file in an APEX bundle. This is created during the first half of
 // GenerateAndroidBuildActions by traversing the dependencies of the APEX. Then in the second half
 // of the function, this is used to create commands that copies the files into a staging directory,
@@ -1970,7 +1957,11 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
 		case testTag:
 			if ccInfo, ok := android.OtherModuleProvider(ctx, child, cc.CcInfoProvider); ok {
 				af := apexFileForExecutable(ctx, child, commonInfo, ccInfo)
-				af.class = nativeTest
+				// We make this a nativeExecutable instead of a nativeTest because we don't want
+				// the androidmk modules generated in AndroidMkForFiles to be treated as real
+				// tests that are then packaged into suites. Our AndroidMkForFiles does not
+				// implement enough functionality to support real tests.
+				af.class = nativeExecutable
 				vctx.filesInfo = append(vctx.filesInfo, af)
 				return true // track transitive dependencies
 			} else {