aboutsummaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2019-02-07 16:46:59 +0900
committerJiyong Park <jiyong@google.com>2019-02-07 16:48:04 +0900
commit41229f584a9cdd4095488960dc8fe6d8372fa635 (patch)
tree93c7530b55d09624f6eac8f7c4151982e97c272d /apex
parent3a984f55f64ecbababa7a274d768d9d365c81fa5 (diff)
downloadbuild_soong-41229f584a9cdd4095488960dc8fe6d8372fa635.tar.gz
build_soong-41229f584a9cdd4095488960dc8fe6d8372fa635.tar.bz2
build_soong-41229f584a9cdd4095488960dc8fe6d8372fa635.zip
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
Diffstat (limited to 'apex')
-rw-r--r--apex/apex.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 3584896b..d25c256c 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() {