Make llvm-strip depend on both lib and lib64 am: d1fb75df9a

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

Change-Id: Ibb945c851a06b3eb651870f14e15d64b68936f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chih-Hung Hsieh
2022-08-16 03:21:47 +00:00
committed by Automerger Merge Worker

View File

@@ -166,9 +166,10 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
} else {
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 {
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib)
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib64).ImplicitTool(llvmLib)
if !ctx.Windows() {
cmd.Flag("-x")
}