From 41229f584a9cdd4095488960dc8fe6d8372fa635 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 7 Feb 2019 16:46:59 +0900
Subject: [PATCH] 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
---
 apex/apex.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apex/apex.go b/apex/apex.go
index 3584896bd..d25c256cf 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1046,7 +1046,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD
 		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() {