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

Commit 28bca125 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Automerger Merge Worker
Browse files

Merge "Specify working directory and OUT_DIR to ABI tools" am: 1f019f94 

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

Change-Id: I57044e5741223b1963c4923f6f8c6394b6080ebb
parents 9f354c86 1f019f94

cc/builder.go

+2 −2
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ var ( 
	// -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information.

	// -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information.

	sAbiDump, sAbiDumpRE = pctx.RemoteStaticRules("sAbiDump",

	sAbiDump, sAbiDumpRE = pctx.RemoteStaticRules("sAbiDump",

		blueprint.RuleParams{

		blueprint.RuleParams{

			Command:     "rm -f $out && $reTemplate$sAbiDumper -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers",

			Command:     "rm -f $out && $reTemplate$sAbiDumper --root-dir . --root-dir $$OUT_DIR:out -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers",

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

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

		}, &remoteexec.REParams{

		}, &remoteexec.REParams{

			Labels:       map[string]string{"type": "abi-dump", "tool": "header-abi-dumper"},

			Labels:       map[string]string{"type": "abi-dump", "tool": "header-abi-dumper"},
@@ -255,7 +255,7 @@ var ( 
	// sAbi dump file.

	// sAbi dump file.

	sAbiLink, sAbiLinkRE = pctx.RemoteStaticRules("sAbiLink",

	sAbiLink, sAbiLinkRE = pctx.RemoteStaticRules("sAbiLink",

		blueprint.RuleParams{

		blueprint.RuleParams{

			Command:        "$reTemplate$sAbiLinker -o ${out} $symbolFilter -arch $arch  $exportedHeaderFlags @${out}.rsp ",

			Command:        "$reTemplate$sAbiLinker --root-dir . --root-dir $$OUT_DIR:out -o ${out} $symbolFilter -arch $arch $exportedHeaderFlags @${out}.rsp",

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

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

			Rspfile:        "${out}.rsp",

			Rspfile:        "${out}.rsp",

			RspfileContent: "${in}",

			RspfileContent: "${in}",