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

Revert "Share vdex files in the ART apex between architectures (..."

Browse Source 
Revert submission 1254009-vdex-symlinks

Reason for revert: This causing some devices to fail to boot. See b/151836042 for details.
Reverted Changes:
Iced89071b:Expect vdex files in a target-independent director...
Ifbceb8457:Share vdex files in the ART apex between architect...

Change-Id: I5bd88f8e61d442eed921d840c90777a2750ddb16
This commit is contained in:
Tim Joines
2020-03-18 18:00:41 +00:00
parent 5b88fe36b5
commit c1ef1bb5cc
3 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/builder.go
View File

@@ -335,7 +335,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
for _, fi := range a.filesInfo {
destPath := android.PathForModuleOut(ctx, "image"+suffix, fi.Path()).String()
copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(destPath))
if a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform() {
// TODO(jiyong): pathOnDevice should come from fi.module, not being calculated here
pathOnDevice := filepath.Join("/system", fi.Path())
@@ -344,16 +343,10 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath)
implicitInputs = append(implicitInputs, fi.builtFile)
}
// create additional symlinks pointing the file inside the APEX
for _, symlinkPath := range fi.SymlinkPaths() {
symlinkDest := android.PathForModuleOut(ctx, "image"+suffix, symlinkPath).String()
symlinkTarget, err := filepath.Rel(filepath.Dir(symlinkDest), destPath)
if err != nil {
panic("Cannot compute relative path from " + destPath + " to " + filepath.Dir(symlinkDest))
}
copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(symlinkDest))
copyCommands = append(copyCommands, "ln -sfn "+symlinkTarget+" "+symlinkDest)
copyCommands = append(copyCommands, "ln -sfn "+filepath.Base(destPath)+" "+symlinkDest)
}
}
@@ -416,7 +409,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
}
} else {
readOnlyPaths = append(readOnlyPaths, pathInApex)
readOnlyPaths = append(readOnlyPaths, f.SymlinkPaths()...)
}
dir := f.installDir
for !android.InList(dir, executablePaths) && dir != "" {