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

Commit 72f1f3ec authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Fix the construction of ziptype APEX 

If payload type of APEX is zip, flattened variant and non-flattened
variant create the same MK rules (it's build error). So only
non-flattened variant case, MK rule is created.
And if a.flattenedConfigValue is true, soong don't mutate variants. So
when a.flattenedConfigValue is true, MK rule should be created.

This CL is a partial revert of 4c047138

Bug: 139716748
Test: m -j com.android.art.host
Change-Id: I37b2fa17e203fb668a0255cda37f10fcfadb3f85
parent 4e812550

apex/apex.go

+2 −2
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap 
	})



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

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

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

		ctx.InstallFile(a.installDir, ctx.ModuleName()+suffix, a.outputFiles[apexType])

	}

}
@@ -1596,7 +1596,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD 
				fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")

				fmt.Fprintln(w, "$(LOCAL_INSTALLED_MODULE): .KATI_IMPLICIT_OUTPUTS :=", a.flattenedOutput.String())



			} else {

			} else if !a.properties.Flattened || a.flattenedConfigValue {

				// zip-apex is the less common type so have the name refer to the image-apex

				// only and use {name}.zip if you want the zip-apex

				if apexType == zipApex && a.apexTypes == both {