Remove unused parts of the strip implementation.
The --use-gnu-strip option was removed from the shell script already,
and it no longer uses the $CROSS_COMPILE environment variable.
Bug: http://b/185257607
Bug: http://b/147452927
Test: treehugger
Change-Id: If9f7b75d52c1e9cd167d73eeba8f77054ffd63a7
diff --git a/cc/builder.go b/cc/builder.go
index 0542015..29cde9d 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -143,7 +143,7 @@
}(),
Pool: darwinStripPool,
},
- "args", "crossCompile")
+ "args")
// Rule to invoke `strip` (to discard symbols and data from object files) on darwin architecture.
darwinStrip = pctx.AndroidStaticRule("darwinStrip",
@@ -993,7 +993,6 @@
func transformStrip(ctx android.ModuleContext, inputFile android.Path,
outputFile android.WritablePath, flags StripFlags) {
- crossCompile := gccCmd(flags.Toolchain, "")
args := ""
if flags.StripAddGnuDebuglink {
args += " --add-gnu-debuglink"
@@ -1010,9 +1009,6 @@
if flags.StripKeepSymbolsAndDebugFrame {
args += " --keep-symbols-and-debug-frame"
}
- if flags.StripUseGnuStrip {
- args += " --use-gnu-strip"
- }
ctx.Build(pctx, android.BuildParams{
Rule: strip,
@@ -1020,8 +1016,7 @@
Output: outputFile,
Input: inputFile,
Args: map[string]string{
- "crossCompile": crossCompile,
- "args": args,
+ "args": args,
},
})
}