From c80b5fa0c61baaf1ab52b9760d77d4f1621534c2 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sat, 20 Jul 2019 14:24:33 +0900 Subject: [PATCH] Fix: symlink bin/arm directory is not handled correctly This change fixes a bug that a symlink in the bin/* directory of an APEX is not added to the fs_config file. Bug: 137918291 Test: choosecombo aosp_x86_arm TARGET_FLATTEN_APEX=false m com.android.runtime.debug is successful Change-Id: Ib10b635f08e03b18e8ad5407d8de6bac2c85326d --- apex/apex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/apex.go b/apex/apex.go index 284af5cf1..ba73163f8 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1009,7 +1009,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)