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

Commit bc30a078 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Always build zipapex's unflattened." am: ad0328de am: 2d310f95 

am: 6c4c5a2c

Change-Id: Ie1f5c7129ad38fd5db98ce99a9071788f056f656
parents c575f083 6c4c5a2c

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile and 
	})



	// Install to $OUT/soong/{target,host}/.../apex

	if a.installable() && !ctx.Config().FlattenApex() {

	if a.installable() && (!ctx.Config().FlattenApex() || apexType.zip()) {

		ctx.InstallFile(android.PathForModuleInstall(ctx, "apex"), ctx.ModuleName()+suffix, a.outputFiles[apexType])

	}

}