Merge "Geneate AndroidManifest file if the apex_test module does not have one." am: 7fbe3c7f59 am: 82371b5ac2 am: 4971051525

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1971344

Change-Id: I260611433e85f4c9dad86e8dd85c1f4ef56b0b97
diff --git a/apex/builder.go b/apex/builder.go
index 1a1f22b..432fcaa 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -618,6 +618,8 @@
 
 			implicitInputs = append(implicitInputs, androidManifestFile)
 			optFlags = append(optFlags, "--android_manifest "+androidManifestFile.String())
+		} else if a.testApex {
+			optFlags = append(optFlags, "--test_only")
 		}
 
 		// Determine target/min sdk version from the context