summaryrefslogtreecommitdiff
path: root/apex/apex.go
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2019-11-27 07:30:54 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-11-27 07:30:54 +0000
commit6aa363b7ae9d65f367faae8f4ed56ea07a005f7b (patch)
treeadd28fa1f6b33937be499156ace1decbea83fbb3 /apex/apex.go
parent42775ba0bc531a1ae90a280e655f607bc7a6cb49 (diff)
parent91df2084ad34cc59df6abc95284338032c517c25 (diff)
Merge "Fix: install flattened apex on system_ext"
Diffstat (limited to 'apex/apex.go')
-rw-r--r--apex/apex.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 4c5e06b8f..45184b55f 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -178,7 +178,7 @@ func apexFlattenedMutator(mctx android.BottomUpMutatorContext) {
modules[i].(*apexBundle).properties.ApexType = zipApex
case flattenedApexType:
modules[i].(*apexBundle).properties.ApexType = flattenedApex
- if !mctx.Config().FlattenApex() {
+ if !mctx.Config().FlattenApex() && ab.Platform() {
modules[i].(*apexBundle).MakeAsSystemExt()
}
}