Skip to content

Commit

Permalink
Building chip-cert tool in the same location with other tools (#8307)
Browse files Browse the repository at this point in the history
  • Loading branch information
emargolis authored and pull[bot] committed Sep 23, 2021
1 parent 65980e4 commit 3995656
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
13 changes: 13 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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})" ]
Expand Down Expand Up @@ -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" ]
}
Expand Down
2 changes: 2 additions & 0 deletions src/tools/chip-cert/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ executable("chip-cert") {
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
]

output_dir = root_out_dir
}

0 comments on commit 3995656

Please sign in to comment.