commit 27cbe86b496c980e8def21f5f3ef4765474c7e84
author Rob Mohr <mohrr@google.com> Tue Aug 22 16:59:31 2023 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 22 16:59:31 2023 +0000
tree 7d638ef44d126ee61d59ff26dd78bcb8ae7c0937
parent 4284d2ee235083944964ff35bd7c6d47bf396415

pw_build: Use pw_toolchain_clang_tools

Use pw_toolchain_clang_tools to retrieve paths for llvm-cov and
llvm-profdata.

Change-Id: I87bf25d2a1e3f38e37516490a793c7470744e548
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/167671
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Reviewed-by: Armando Montanez <amontanez@google.com>

pw_build/coverage_report.gni

diff --git a/pw_build/coverage_report.gni b/pw_build/coverage_report.gni
index eb50b88..8c4996d 100644
--- a/pw_build/coverage_report.gni
+++ b/pw_build/coverage_report.gni
@@ -157,8 +157,7 @@
       module = "pw_build.merge_profraws"
       args = [
         "--llvm-profdata-path",
-        rebase_path("$pw_env_setup_CIPD_PIGWEED/bin/llvm-profdata",
-                    root_build_dir),
+        pw_toolchain_clang_tools.llvm_profdata,
         "--test-metadata-path",
         rebase_path(_test_metadata, root_build_dir),
         "--profdata-path",
@@ -201,8 +200,7 @@
         module = "pw_build.generate_report"
         args = [
           "--llvm-cov-path",
-          rebase_path("$pw_env_setup_CIPD_PIGWEED/bin/llvm-cov",
-                      root_build_dir),
+          pw_toolchain_clang_tools.llvm_cov,
           "--format",
           format,
           "--test-metadata-path",

pw_toolchain/clang_tools.gni

diff --git a/pw_toolchain/clang_tools.gni b/pw_toolchain/clang_tools.gni
index 32c53bc..5b438a5 100644
--- a/pw_toolchain/clang_tools.gni
+++ b/pw_toolchain/clang_tools.gni
@@ -70,6 +70,8 @@
   cc = "clang"
   cxx = "clang++"
   ld = cxx
+  llvm_cov = "llvm-cov"
+  llvm_profdata = "llvm-profdata"
   rustc = "rustc"
 
   _toolchain_prefix = pw_toolchain_CLANG_PREFIX
@@ -88,6 +90,8 @@
     cc = _toolchain_prefix + cc
     cxx = _toolchain_prefix + cxx
     ld = _toolchain_prefix + ld
+    llvm_cov = _toolchain_prefix + llvm_cov
+    llvm_profdata = _toolchain_prefix + llvm_profdata
   }
 
   _rust_prefix = pw_toolchain_RUST_PREFIX