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

Make llvm-strip depend on both lib and lib64

Browse Source 
* Old compilers look up lib64/libc++.so.1
* New compilers look up lib/libc++.so.1

Bug: 241836377
Test: lunch sdk-userdebug; make sdk_repo
Change-Id: I90e7df9875594a1257e582ef62bac5084f0f939d
This commit is contained in:
Chih-Hung Hsieh
2022-08-09 21:37:48 -07:00
committed by Chih-hung Hsieh
parent 9a5db000da
commit d1fb75df9a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android_sdk/sdk_repo_host.go
View File

@@ -166,9 +166,10 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
} else { } else {
llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") llvmStrip := config.ClangPath(ctx, "bin/llvm-strip")
llvmLib := config.ClangPath(ctx, "lib64/libc++.so.1") llvmLib64 := config.ClangPath(ctx, "lib64/libc++.so.1")
llvmLib := config.ClangPath(ctx, "lib/libc++.so.1")
for _, strip := range s.properties.Strip_files { for _, strip := range s.properties.Strip_files {
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib64).ImplicitTool(llvmLib)
if !ctx.Windows() { if !ctx.Windows() {
cmd.Flag("-x") cmd.Flag("-x")
} }