From a4c6df5d69df6722cd6c0d3ca2ab47e0e352d62c Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Tue, 20 Feb 2018 12:36:51 -0800 Subject: [PATCH] Start using clang-tools prebuilts for abi diffing tools. Bug: 72504455 Test: make -j64 Change-Id: Idbe1142e11147163d0c032fb351e9f3d5614dfb1 --- cc/builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index 279c1da7e..8f253caac 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -172,7 +172,7 @@ var ( }, "windresCmd", "flags") - _ = pctx.SourcePathVariable("sAbiDumper", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-dumper") + _ = pctx.SourcePathVariable("sAbiDumper", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-dumper") // -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information. sAbiDump = pctx.AndroidStaticRule("sAbiDump", @@ -182,7 +182,7 @@ var ( }, "cFlags", "exportDirs") - _ = pctx.SourcePathVariable("sAbiLinker", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-linker") + _ = pctx.SourcePathVariable("sAbiLinker", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-linker") sAbiLink = pctx.AndroidStaticRule("sAbiLink", blueprint.RuleParams{ @@ -193,7 +193,7 @@ var ( }, "symbolFilter", "arch", "exportedHeaderFlags") - _ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff") + _ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-diff") sAbiDiff = pctx.AndroidRuleFunc("sAbiDiff", func(config android.Config) (blueprint.RuleParams, error) {