Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0770a175 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

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

parents 5ac07237 cb3ff1e4

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	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 {