Skip to content

Commit 10aa26d

Browse files
ksperling-applekkasperczyk-no
authored andcommitted
[nrf fromtree] Move config header dependencies from platform to platform_base (project-chip#33324)
Conceptually the generic headers in include/platform/ belong to platform_base, and some of them include these generated headers. Specifically GenericConfigurationManagerImpl.ipp includes FirmwareBuildTime.h ConnectivityManager.h includes ICDServerConfig.h Also enforce we don't have missing deps when building the Darwin framework.
1 parent b0acf15 commit 10aa26d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/darwin/Framework/chip_xcode_build_connector.sh

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

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

src/platform/BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,9 @@ 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",
425426
"${chip_root}/src/ble",
427+
"${chip_root}/src/credentials:build_time_header",
426428
"${chip_root}/src/inet",
427429
"${chip_root}/src/lib/core",
428430
"${chip_root}/src/lib/support",
@@ -511,10 +513,8 @@ if (chip_device_platform != "none") {
511513

512514
public_deps = [
513515
":platform_base",
514-
"${chip_root}/src/app:app_config",
516+
"${chip_root}/src/app:app_config", # TODO: Move into platforms using it
515517
"${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)