Skip to content

Commit 22287e9

Browse files
Move config header dependencies from platform to platform_base
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 98b14ed commit 22287e9

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
@@ -220,5 +220,6 @@ find_in_ancestors() {
220220
# generate and build
221221
set -x
222222
gn --root="$CHIP_ROOT" gen --check out --args="${args[*]}"
223-
exec ninja -v -C out
223+
ninja -C out -v
224+
ninja -C out -t missingdeps
224225
}

src/platform/BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ if (chip_device_platform != "none") {
418418
source_set("platform_base") {
419419
public_deps = [
420420
":platform_config_header",
421+
"${chip_root}/src/app/icd/server:icd-server-config",
421422
"${chip_root}/src/ble",
423+
"${chip_root}/src/credentials:build_time_header",
422424
"${chip_root}/src/inet",
423425
"${chip_root}/src/lib/core",
424426
"${chip_root}/src/lib/support",
@@ -507,10 +509,8 @@ if (chip_device_platform != "none") {
507509

508510
public_deps = [
509511
":platform_base",
510-
"${chip_root}/src/app:app_config",
512+
"${chip_root}/src/app:app_config", # TODO: Move into platforms using it
511513
"${chip_root}/src/app/common:cluster-objects",
512-
"${chip_root}/src/app/icd/server:icd-server-config",
513-
"${chip_root}/src/credentials:build_time_header",
514514
"${chip_root}/src/crypto",
515515
"${chip_root}/src/lib/support",
516516
]

0 commit comments

Comments
 (0)