StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8b5 am: ae4898e3f3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767

Change-Id: I63d42c476c9f140ac34f24cf44705ff665811ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-12-06 01:13:19 +00:00
committed by Automerger Merge Worker
parent 1814a3c758 ae4898e3f3
commit 1835b364fc
1 changed files with 2 additions and 1 deletions
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")
}