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

2019-07-23 00:53:25 +00:00 · 2019-07-23 00:53:25 +00:00 · c793ebf1ae
parent 6edff69513 c80b5fa0c6
commit c793ebf1ae
1 changed files with 1 additions and 1 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@ -1031,7 +1031,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap
 			if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") {
 				executablePaths = append(executablePaths, pathInApex)
 				for _, s := range f.symlinks {
-					executablePaths = append(executablePaths, filepath.Join("bin", s))
+					executablePaths = append(executablePaths, filepath.Join(f.installDir, s))
 				}
 			} else {
 				readOnlyPaths = append(readOnlyPaths, pathInApex)