tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add llvm-objcopy to android_sdk_repo_host's implicit tools

Browse source 
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
This commit is contained in:
Cole Faust 2023-12-05 14:44:42 -08:00
parent fe3777742a
commit df34caf8b5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android_sdk/sdk_repo_host.go
View file

@ -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")
}