Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e21f8f64 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I4fa057fce73f68a436dad57d7d6ff0387297c1ff
parents 65597020 2e0436c7

cc/builder.go

+2 −7
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ var ( 
			}(),

			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 transformBinaryPrefixSymbols(ctx android.ModuleContext, prefix string, inpu 
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 @@ func transformStrip(ctx android.ModuleContext, inputFile android.Path, 
	if flags.StripKeepSymbolsAndDebugFrame {

		args += " --keep-symbols-and-debug-frame"

	}

	if flags.StripUseGnuStrip {

		args += " --use-gnu-strip"

	}



	ctx.Build(pctx, android.BuildParams{

		Rule:        strip,
@@ -1020,7 +1016,6 @@ func transformStrip(ctx android.ModuleContext, inputFile android.Path, 
		Output:      outputFile,

		Input:       inputFile,

		Args: map[string]string{

			"crossCompile": crossCompile,

			"args": args,

		},

	})