diff options
| author | 2023-12-05 14:44:42 -0800 | |
|---|---|---|
| committer | 2023-12-05 14:44:42 -0800 | |
| commit | df34caf8b52c07eb56ffcda5fdce1057217c8b47 (patch) | |
| tree | d60b7fb8d5cf85f57faa2c0ae6a6fcce4b61ce81 /android_sdk | |
| parent | fe3777742a3f831fc0bd62c2435d4bc64ee78aa7 (diff) | |
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
Diffstat (limited to 'android_sdk')
| -rw-r--r-- | android_sdk/sdk_repo_host.go | 3 |
1 files changed, 2 insertions, 1 deletions
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") } |