Merge "Revert "Make llvm-strip depend on both lib and lib64""
This commit is contained in:
commit
3e439f42e9
1 changed files with 2 additions and 3 deletions
|
@ -166,10 +166,9 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
}
|
||||
} else {
|
||||
llvmStrip := config.ClangPath(ctx, "bin/llvm-strip")
|
||||
llvmLib64 := config.ClangPath(ctx, "lib64/libc++.so.1")
|
||||
llvmLib := config.ClangPath(ctx, "lib/libc++.so.1")
|
||||
llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so.1")
|
||||
for _, strip := range s.properties.Strip_files {
|
||||
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib64).ImplicitTool(llvmLib)
|
||||
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib)
|
||||
if !ctx.Windows() {
|
||||
cmd.Flag("-x")
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue