Merge "Fix the construction of ziptype APEX" (999b5fea) · Commits · e / os / android_build_soong

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 {