From df34caf8b52c07eb56ffcda5fdce1057217c8b47 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 5 Dec 2023 14:44:42 -0800 Subject: [PATCH] Add llvm-objcopy to android_sdk_repo_host's implicit tools llvm-strip is actually a symlink to llvm-objcopy. Since aosp/2850015, rules must add both the symlink and the target of the symlink to the sandbox to avoid a dangling symlink. Fixes: 314994282 Test: m sdk sdk_repo dist Change-Id: I72494596f3597e176222a44c822d0b12cdd4cde4 --- android_sdk/sdk_repo_host.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android_sdk/sdk_repo_host.go b/android_sdk/sdk_repo_host.go index 7212a0740..373e88306 100644 --- a/android_sdk/sdk_repo_host.go +++ b/android_sdk/sdk_repo_host.go @@ -165,10 +165,11 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { Flag(dir.Join(ctx, strip).String()) } } else { + llvmObjCopy := config.ClangPath(ctx, "bin/llvm-objcopy") llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so") for _, strip := range s.properties.Strip_files { - cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) + cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib).ImplicitTool(llvmObjCopy) if !ctx.Windows() { cmd.Flag("-x") }