tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix: symlink bin/arm directory is not handled correctly"

Browse source 
am: c793ebf1ae

Change-Id: I804e7b18359a1a032568dd6599e58e681de82767
This commit is contained in:
Jiyong Park 2019-07-22 18:14:15 -07:00 committed by android-build-merger
commit 6af7e64515
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apex/apex.go
View file

@ -1031,7 +1031,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap
if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") { if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") {
executablePaths = append(executablePaths, pathInApex) executablePaths = append(executablePaths, pathInApex)
for _, s := range f.symlinks { for _, s := range f.symlinks {
executablePaths = append(executablePaths, filepath.Join("bin", s)) executablePaths = append(executablePaths, filepath.Join(f.installDir, s))
} }
} else { } else {
readOnlyPaths = append(readOnlyPaths, pathInApex) readOnlyPaths = append(readOnlyPaths, pathInApex)