Use llvm-{strip,objcopy} by default
... except for Darwin Mach-O, as it is not supported by llvm-strip.
Test: m checkbuild
Bug: 119221035
Change-Id: I021637b6dd3530bff1f563f2ec7c2168e1083b7e
diff --git a/cc/library.go b/cc/library.go
index 13acfae..d716ffa 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -686,9 +686,9 @@
TransformSharedObjectToToc(ctx, outputFile, tocFile, builderFlags)
if library.stripper.needsStrip(ctx) {
- // b/80093681, GNU strip/objcopy bug.
- // Use llvm-{strip,objcopy} when clang lld is used.
- builderFlags.stripUseLlvmStrip = library.baseLinker.useClangLld(ctx)
+ if ctx.Darwin() {
+ builderFlags.stripUseGnuStrip = true
+ }
strippedOutputFile := outputFile
outputFile = android.PathForModuleOut(ctx, "unstripped", fileName)
library.stripper.strip(ctx, outputFile, strippedOutputFile, builderFlags)