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

Commit 8fec83a8 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Use xz prebuilt 

Instead of whichever xz happens to be on the PATH.

Bug: 36130900
Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: Ic9b66062ca7947f0eca9d839c0864da492d4ef71
parent 8aed42c7

cc/builder.go

+3 −2
Original line number Diff line number Diff line
@@ -109,13 +109,14 @@ var ( 
		"objcopyCmd", "prefix")



	_ = pctx.SourcePathVariable("stripPath", "build/soong/scripts/strip.sh")

	_ = pctx.SourcePathVariable("xzCmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/xz")



	strip = pctx.AndroidStaticRule("strip",

		blueprint.RuleParams{

			Depfile:     "${out}.d",

			Deps:        blueprint.DepsGCC,

			Command:     "CROSS_COMPILE=$crossCompile $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",

			CommandDeps: []string{"$stripPath"},

			Command:     "CROSS_COMPILE=$crossCompile XZ=$xzCmd $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",

			CommandDeps: []string{"$stripPath", "$xzCmd"},

		},

		"args", "crossCompile")

scripts/strip.sh

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
# Inputs:

#  Environment:

#   CROSS_COMPILE: prefix added to readelf, objcopy tools

#   XZ: path to the xz binary

#  Arguments:

#   -i ${file}: input file (required)

#   -o ${file}: output file (required)
@@ -58,7 +59,7 @@ do_strip_keep_mini_debug_info() { 
        "${CROSS_COMPILE}objcopy" --rename-section .debug_frame=saved_debug_frame "${outfile}.debug" "${outfile}.mini_debuginfo"

        "${CROSS_COMPILE}objcopy" -S --remove-section .gdb_index --remove-section .comment --keep-symbols="${outfile}.keep_symbols" "${outfile}.mini_debuginfo"

        "${CROSS_COMPILE}objcopy" --rename-section saved_debug_frame=.debug_frame "${outfile}.mini_debuginfo"

        xz "${outfile}.mini_debuginfo"

        "${XZ}" "${outfile}.mini_debuginfo"

        "${CROSS_COMPILE}objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"

    else

        cp -f "${infile}" "${outfile}.tmp"