Change the partition of outputfile
If some apex module can be installed for both flattened and unflattened,
flattened apex should be installed to system_ext partition.
So add MakeAsSystemExt func to change the partition from system to
system_ext.
Bug: 139053989
Test: m -j
Change-Id: I3e3430413a9045d96130af99e249567b1a26ed7e
diff --git a/apex/apex.go b/apex/apex.go
index 3aaa1ef..a5925f2 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -345,7 +345,7 @@
case "both":
variants = append(variants, imageApexType, zipApexType, flattenedApexType)
default:
- mctx.PropertyErrorf("type", "%q is not one of \"image\" or \"zip\".", *ab.properties.Payload_type)
+ mctx.PropertyErrorf("type", "%q is not one of \"image\", \"zip\", or \"both\".", *ab.properties.Payload_type)
return
}
@@ -359,6 +359,9 @@
modules[i].(*apexBundle).properties.ApexType = zipApex
case flattenedApexType:
modules[i].(*apexBundle).properties.ApexType = flattenedApex
+ if !mctx.Config().FlattenApex() {
+ modules[i].(*apexBundle).MakeAsSystemExt()
+ }
}
}
}