Merge "Fix: TARGET_FLATTEN_APEX=true does not install any files to /system/apex" am: 6e8fe6feb1
am: 5168ece030
am: 8dd220b4be
Change-Id: I256b0b2d5fe57f341bce66a80a7183cf4eee8708
This commit is contained in:
commit
ebcbf8add8
|
@ -1046,7 +1046,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD
|
||||||
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
||||||
moduleNames := []string{}
|
moduleNames := []string{}
|
||||||
if a.installable() {
|
if a.installable() {
|
||||||
a.androidMkForFiles(w, name, moduleDir)
|
moduleNames = a.androidMkForFiles(w, name, moduleDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
if a.flattened && apexType.image() {
|
if a.flattened && apexType.image() {
|
||||||
|
|
Loading…
Reference in New Issue