Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f578b7c6 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Fix: symlink bin/arm directory is not handled correctly" am: c793ebf1 am: 6af7e645 

am: 6842fab1

Change-Id: Ib3f43e3b23b7aec03b1ff7dfbb9ec9fdf43b0b4d
parents f9d1acf2 6842fab1

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -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)