Skip to content

Commit

Permalink
Move config header dependencies from platform to platform_base (#33324)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ksperling-apple authored May 7, 2024
1 parent d75f73c commit 408eaf6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/darwin/Framework/chip_xcode_build_connector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,6 @@ find_in_ancestors() {
# generate and build
set -x
gn --root="$CHIP_ROOT" gen --check out --args="${args[*]}"
exec ninja -v -C out
ninja -C out -v
ninja -C out -t missingdeps
}
6 changes: 3 additions & 3 deletions src/platform/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ if (chip_device_platform != "none") {
source_set("platform_base") {
public_deps = [
":platform_config_header",
"${chip_root}/src/app/icd/server:icd-server-config",
"${chip_root}/src/ble",
"${chip_root}/src/credentials:build_time_header",
"${chip_root}/src/inet",
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
Expand Down Expand Up @@ -507,10 +509,8 @@ if (chip_device_platform != "none") {

public_deps = [
":platform_base",
"${chip_root}/src/app:app_config",
"${chip_root}/src/app:app_config", # TODO: Move into platforms using it
"${chip_root}/src/app/common:cluster-objects",
"${chip_root}/src/app/icd/server:icd-server-config",
"${chip_root}/src/credentials:build_time_header",
"${chip_root}/src/crypto",
"${chip_root}/src/lib/support",
]
Expand Down

0 comments on commit 408eaf6

Please sign in to comment.