StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused parts of the strip implementation." am: 2e0436c7af am: e21f8f645c

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

Change-Id: I877f85e65332773d4649754e1573d9a0cff3ee58
This commit is contained in:
Elliott Hughes
2021-05-07 18:48:18 +00:00
committed by Automerger Merge Worker
parent 690697082b e21f8f645c
commit 9fb4c1bbac
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/builder.go
View File

@@ -143,7 +143,7 @@ var (
}(), }(),
Pool: darwinStripPool, Pool: darwinStripPool,
}, },
"args", "crossCompile") "args")
// Rule to invoke `strip` (to discard symbols and data from object files) on darwin architecture. // Rule to invoke `strip` (to discard symbols and data from object files) on darwin architecture.
darwinStrip = pctx.AndroidStaticRule("darwinStrip", darwinStrip = pctx.AndroidStaticRule("darwinStrip",
@@ -993,7 +993,6 @@ func transformBinaryPrefixSymbols(ctx android.ModuleContext, prefix string, inpu
func transformStrip(ctx android.ModuleContext, inputFile android.Path, func transformStrip(ctx android.ModuleContext, inputFile android.Path,
outputFile android.WritablePath, flags StripFlags) { outputFile android.WritablePath, flags StripFlags) {
crossCompile := gccCmd(flags.Toolchain, "")
args := "" args := ""
if flags.StripAddGnuDebuglink { if flags.StripAddGnuDebuglink {
args += " --add-gnu-debuglink" args += " --add-gnu-debuglink"
@@ -1010,9 +1009,6 @@ func transformStrip(ctx android.ModuleContext, inputFile android.Path,
if flags.StripKeepSymbolsAndDebugFrame { if flags.StripKeepSymbolsAndDebugFrame {
args += " --keep-symbols-and-debug-frame" args += " --keep-symbols-and-debug-frame"
} }
if flags.StripUseGnuStrip {
args += " --use-gnu-strip"
}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: strip, Rule: strip,
@@ -1020,8 +1016,7 @@ func transformStrip(ctx android.ModuleContext, inputFile android.Path,
Output: outputFile, Output: outputFile,
Input: inputFile, Input: inputFile,
Args: map[string]string{ Args: map[string]string{
"crossCompile": crossCompile, "args": args,
"args": args,
}, },
}) })
} }