commit c793ebf1aed3d92539a825f7b5353ec38f6e20a2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 23 00:53:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 00:53:25 2019 +0000
tree e6b486b47133d478dfa734cd5c1c8aed2f73220e
parent 6edff69513a79029d6a6675c49f46da0d5583ba6
parent c80b5fa0c61baaf1ab52b9760d77d4f1621534c2

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

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 4e6c0b1..8b0f385 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1031,7 +1031,7 @@
 			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)