Merge "Fix the construction of host APEX (.zipapex
) packages."
am: 33ba06ccad
Change-Id: I3af3f9d5f5f7af35f96b18ec261610bb186b9c3d
This commit is contained in:
@@ -1597,7 +1597,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD
|
|||||||
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
|
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
|
||||||
fmt.Fprintln(w, "$(LOCAL_INSTALLED_MODULE): .KATI_IMPLICIT_OUTPUTS :=", a.flattenedOutput.String())
|
fmt.Fprintln(w, "$(LOCAL_INSTALLED_MODULE): .KATI_IMPLICIT_OUTPUTS :=", a.flattenedOutput.String())
|
||||||
|
|
||||||
} else if !a.properties.Flattened {
|
} else {
|
||||||
// zip-apex is the less common type so have the name refer to the image-apex
|
// 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
|
// only and use {name}.zip if you want the zip-apex
|
||||||
if apexType == zipApex && a.apexTypes == both {
|
if apexType == zipApex && a.apexTypes == both {
|
||||||
|
Reference in New Issue
Block a user