Merge "Fix: install flattened apex on system_ext"

2019-11-27 07:30:54 +00:00
parent 42775ba0bc 91df2084ad
commit 6aa363b7ae
3 changed files with 44 additions and 33 deletions
--- 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()
 				}
 			}