Skip to content

Commit c548b54

Browse files
committed
Revert "[nrf fromtree] Move config header dependencies from platform to platform_base (project-chip#33324)"
This reverts commit 10aa26d. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent d6296ce commit c548b54

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/darwin/Framework/chip_xcode_build_connector.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,5 @@ find_in_ancestors() {
208208

209209
# generate and build
210210
gn --root="$CHIP_ROOT" gen --check out --args="${args[*]}"
211-
ninja -C out -v
212-
ninja -C out -t missingdeps
211+
exec ninja -v -C out
213212
}

src/platform/BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,7 @@ if (chip_device_platform != "none") {
422422
source_set("platform_base") {
423423
public_deps = [
424424
":platform_config_header",
425-
"${chip_root}/src/app/icd/server:icd-server-config",
426425
"${chip_root}/src/ble",
427-
"${chip_root}/src/credentials:build_time_header",
428426
"${chip_root}/src/inet",
429427
"${chip_root}/src/lib/core",
430428
"${chip_root}/src/lib/support",
@@ -513,8 +511,10 @@ if (chip_device_platform != "none") {
513511

514512
public_deps = [
515513
":platform_base",
516-
"${chip_root}/src/app:app_config", # TODO: Move into platforms using it
514+
"${chip_root}/src/app:app_config",
517515
"${chip_root}/src/app/common:cluster-objects",
516+
"${chip_root}/src/app/icd/server:icd-server-config",
517+
"${chip_root}/src/credentials:build_time_header",
518518
"${chip_root}/src/crypto",
519519
"${chip_root}/src/lib/support",
520520
]

0 commit comments

Comments
 (0)