diff --git a/apex/builder.go b/apex/builder.go
index 464d843..97be852 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -335,6 +335,7 @@
 	for _, fi := range a.filesInfo {
 		destPath := android.PathForModuleOut(ctx, "image"+suffix, fi.Path()).String()
 		copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(destPath))
+
 		if a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform() {
 			// TODO(jiyong): pathOnDevice should come from fi.module, not being calculated here
 			pathOnDevice := filepath.Join("/system", fi.Path())
@@ -343,10 +344,16 @@
 			copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath)
 			implicitInputs = append(implicitInputs, fi.builtFile)
 		}
+
 		// create additional symlinks pointing the file inside the APEX
 		for _, symlinkPath := range fi.SymlinkPaths() {
 			symlinkDest := android.PathForModuleOut(ctx, "image"+suffix, symlinkPath).String()
-			copyCommands = append(copyCommands, "ln -sfn "+filepath.Base(destPath)+" "+symlinkDest)
+			symlinkTarget, err := filepath.Rel(filepath.Dir(symlinkDest), destPath)
+			if err != nil {
+				panic("Cannot compute relative path from " + destPath + " to " + filepath.Dir(symlinkDest))
+			}
+			copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(symlinkDest))
+			copyCommands = append(copyCommands, "ln -sfn "+symlinkTarget+" "+symlinkDest)
 		}
 	}
 
@@ -409,6 +416,7 @@
 				}
 			} else {
 				readOnlyPaths = append(readOnlyPaths, pathInApex)
+				readOnlyPaths = append(readOnlyPaths, f.SymlinkPaths()...)
 			}
 			dir := f.installDir
 			for !android.InList(dir, executablePaths) && dir != "" {