Fix: TARGET_FLATTEN_APEX=true does not install any files to /system/apex
94427265d1e4de783cec0ebe24057268bd87cc5b broke the flattened APEX
by not updating moduleNames
Test: TARGET_FLATTEN_APEX=true m
Files are under /system/apex
Change-Id: I14b1a6f8b2244d35e1accdf9888cfef65f4b0a03
diff --git a/apex/apex.go b/apex/apex.go
index 3584896..d25c256 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1046,7 +1046,7 @@
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{}
if a.installable() {
- a.androidMkForFiles(w, name, moduleDir)
+ moduleNames = a.androidMkForFiles(w, name, moduleDir)
}
if a.flattened && apexType.image() {