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
This commit is contained in:
Yi Kong
2018-11-07 16:28:49 -08:00
parent 93c3f5368d
commit b5c34d7f40
4 changed files with 19 additions and 21 deletions

View File

@@ -686,9 +686,9 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
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)