Merge "apex: file_contexts for override_apex flattened" into rvc-dev
diff --git a/apex/builder.go b/apex/builder.go
index f84d426..84cbff8 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -587,7 +587,7 @@
apexBundleName := a.Name()
a.outputFile = android.PathForModuleInstall(&factx, "apex", apexBundleName)
- if a.installable() && a.GetOverriddenBy() == "" {
+ if a.installable() {
installPath := android.PathForModuleInstall(ctx, "apex", apexBundleName)
devicePath := android.InstallPathToOnDevicePath(ctx, installPath)
addFlattenedFileContextsInfos(ctx, apexBundleName+":"+devicePath+":"+a.fileContexts.String())