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

Merge "Install appSet using InstallFileWithExtraFilesZip"

Browse Source
This commit is contained in:
Jiyong Park
2022-10-21 00:17:52 +00:00
committed by Gerrit Code Review
parent e127b4d060 f648d53154
commit 61807339b8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/builder.go
View File

@@ -921,6 +921,11 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
pathOnDevice := filepath.Join("/system", fi.path()) pathOnDevice := filepath.Join("/system", fi.path())
installedSymlinks = append(installedSymlinks, installedSymlinks = append(installedSymlinks,
ctx.InstallAbsoluteSymlink(installDir, fi.stem(), pathOnDevice)) ctx.InstallAbsoluteSymlink(installDir, fi.stem(), pathOnDevice))
} else {
if fi.class == appSet {
as := fi.module.(*java.AndroidAppSet)
ctx.InstallFileWithExtraFilesZip(installDir, as.BaseModuleName()+".apk",
as.OutputFile(), as.PackedAdditionalOutputs())
} else { } else {
target := ctx.InstallFile(installDir, fi.stem(), fi.builtFile) target := ctx.InstallFile(installDir, fi.stem(), fi.builtFile)
for _, sym := range fi.symlinks { for _, sym := range fi.symlinks {
@@ -929,6 +934,7 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
} }
} }
} }
}
// Create install rules for the files added in GenerateAndroidBuildActions after // Create install rules for the files added in GenerateAndroidBuildActions after
// buildFlattenedApex is called. Add the links to system libs (if any) as dependencies // buildFlattenedApex is called. Add the links to system libs (if any) as dependencies