Skip to content

Commit 3995704

Browse files
emargolispull[bot]
authored andcommitted
Building chip-cert tool in the same location with other tools (#8307)
1 parent 17b0bbd commit 3995704

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

BUILD.gn

+13
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
183183
# Enable building chip with gcc & mbedtls.
184184
enable_host_gcc_mbedtls_build = enable_default_builds && host_os != "win"
185185

186+
# Build the chip-cert tool.
187+
enable_standalone_chip_cert_build =
188+
enable_default_builds && host_os != "win" && chip_crypto == "openssl"
189+
186190
# Build the chip-tool example.
187191
enable_standalone_chip_tool_build =
188192
enable_default_builds && host_os != "win"
@@ -274,6 +278,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
274278
standalone_toolchain = "${chip_root}/config/standalone/toolchain:standalone"
275279
not_needed([ "standalone_toolchain" ]) # Might not be needed.
276280

281+
if (enable_standalone_chip_cert_build) {
282+
group("standalone_chip_cert") {
283+
deps = [ "${chip_root}/src/tools/chip-cert(${standalone_toolchain})" ]
284+
}
285+
}
286+
277287
if (enable_standalone_chip_tool_build) {
278288
group("standalone_chip_tool") {
279289
deps = [ "${chip_root}/examples/chip-tool(${standalone_toolchain})" ]
@@ -390,6 +400,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
390400
":android_x86",
391401
]
392402
}
403+
if (enable_standalone_chip_cert_build) {
404+
deps += [ ":standalone_chip_cert" ]
405+
}
393406
if (enable_standalone_chip_tool_build) {
394407
deps += [ ":standalone_chip_tool" ]
395408
}

src/tools/chip-cert/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ executable("chip-cert") {
4545
"${chip_root}/src/lib/core",
4646
"${chip_root}/src/lib/support",
4747
]
48+
49+
output_dir = root_out_dir
4850
}

0 commit comments

Comments
 (0)