From 0f87a3d11ccd48b81565098501bc3d9f635a8b65 Mon Sep 17 00:00:00 2001
From: Evgeny Margolis <emargolis@google.com>
Date: Mon, 12 Jul 2021 20:18:00 -0700
Subject: [PATCH] Building chip-cert tool in the same location with other tools
 (#8307)

---
 BUILD.gn                     | 13 +++++++++++++
 src/tools/chip-cert/BUILD.gn |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index efdc7f5991cce5..ee06f5a3240b87 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -183,6 +183,10 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Enable building chip with gcc & mbedtls.
     enable_host_gcc_mbedtls_build = enable_default_builds && host_os != "win"
 
+    # Build the chip-cert tool.
+    enable_standalone_chip_cert_build =
+        enable_default_builds && host_os != "win" && chip_crypto == "openssl"
+
     # Build the chip-tool example.
     enable_standalone_chip_tool_build =
         enable_default_builds && host_os != "win"
@@ -274,6 +278,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
   standalone_toolchain = "${chip_root}/config/standalone/toolchain:standalone"
   not_needed([ "standalone_toolchain" ])  # Might not be needed.
 
+  if (enable_standalone_chip_cert_build) {
+    group("standalone_chip_cert") {
+      deps = [ "${chip_root}/src/tools/chip-cert(${standalone_toolchain})" ]
+    }
+  }
+
   if (enable_standalone_chip_tool_build) {
     group("standalone_chip_tool") {
       deps = [ "${chip_root}/examples/chip-tool(${standalone_toolchain})" ]
@@ -390,6 +400,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         ":android_x86",
       ]
     }
+    if (enable_standalone_chip_cert_build) {
+      deps += [ ":standalone_chip_cert" ]
+    }
     if (enable_standalone_chip_tool_build) {
       deps += [ ":standalone_chip_tool" ]
     }
diff --git a/src/tools/chip-cert/BUILD.gn b/src/tools/chip-cert/BUILD.gn
index 2e05a391fa8472..8b5c0253ed9431 100644
--- a/src/tools/chip-cert/BUILD.gn
+++ b/src/tools/chip-cert/BUILD.gn
@@ -45,4 +45,6 @@ executable("chip-cert") {
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
   ]
+
+  output_dir = root_out_dir
 }