diff options
| author | 2019-07-22 18:14:15 -0700 | |
|---|---|---|
| committer | 2019-07-22 18:14:15 -0700 | |
| commit | 6af7e64515541bdd1fb075c087b754d8889b54c0 (patch) | |
| tree | 1b7a8105a95363ce5fddb7245951e5d64a831d24 | |
| parent | 6f716787d1f5fe134042183b81328deffbb0b1bb (diff) | |
| parent | c793ebf1aed3d92539a825f7b5353ec38f6e20a2 (diff) | |
Merge "Fix: symlink bin/arm directory is not handled correctly"
am: c793ebf1ae
Change-Id: I804e7b18359a1a032568dd6599e58e681de82767
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 4e6c0b1ff..8b0f3852c 100644 --- 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) |