StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge Android R"

Browse Source
This commit is contained in:
Xin Li
2020-09-10 17:22:09 +00:00
committed by Gerrit Code Review
parent 79a94a27b6 429c23c1fa
commit 80dc4f137a
19 changed files with 667 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@@ -690,7 +690,7 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
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())