commit 0770a175a11eb14c8f0fceafccd8c59a202c09fa
author Martin Stjernholm <mast@google.com> Wed May 26 18:21:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 26 18:21:45 2021 +0000
tree 699b93761691b56b059f368d1d67c51fdd55bdc7
parent 5ac072371ea6bc5b2a8cc4409b32254e09255f0f
parent cb3ff1e412126240141a8a5a8cf104149d4655a2

Merge "Move logic to disable flattening in unbundled app mode from Soong to make."

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 3448327..926085b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2020,7 +2020,7 @@
 	a.filesInfo = filesInfo
 
 	// Set suffix and primaryApexType depending on the ApexType
-	buildFlattenedAsDefault := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuildApps()
+	buildFlattenedAsDefault := ctx.Config().FlattenApex()
 	switch a.properties.ApexType {
 	case imageApex:
 		if buildFlattenedAsDefault {