Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ICD server sources from chip_data_model.cmake #37513

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Remove ICD server sources from chip_data_model.cmake #37513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
596e8eb
Remove ICD server sources from chip_data_model.cmake
adigie Feb 11, 2025
c8e3fd7
Fix ICD dependencies
adigie Feb 11, 2025
36faf0f
Fix gn include warnings
adigie Feb 12, 2025
5f0a30e
iOS TVCasting app: Add missing chip_project_config_include
adigie Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <ti/drivers/apps/LED.h>

#if CHIP_CONFIG_ENABLE_ICD_UAT
#include "app/icd/server/ICDNotifier.h"
#include "app/icd/server/ICDNotifier.h" // nogncheck
#endif

/* syscfg */
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/cc13x4_26x4/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include <ti/drivers/apps/LED.h>

#if CHIP_CONFIG_ENABLE_ICD_UAT
#include "app/icd/server/ICDNotifier.h"
#include "app/icd/server/ICDNotifier.h" // nogncheck
#endif

/* syscfg */
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/cc13x4_26x4/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#include <ti/drivers/apps/LED.h>

#if CHIP_CONFIG_ENABLE_ICD_UAT
#include "app/icd/server/ICDNotifier.h"
#include "app/icd/server/ICDNotifier.h" // nogncheck
#endif

/* syscfg */
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/linux/AppMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
#include <app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h>
#endif
#if CHIP_CONFIG_ENABLE_ICD_SERVER
#include <app/icd/server/ICDManager.h>
#include <app/icd/server/ICDManager.h> // nogncheck
#endif
#include <app/TestEventTriggerDelegate.h>

Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/cc13x4_26x4/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <ti/drivers/apps/LED.h>

#if CHIP_CONFIG_ENABLE_ICD_UAT
#include "app/icd/server/ICDNotifier.h"
#include "app/icd/server/ICDNotifier.h" // nogncheck
#endif

/* syscfg */
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include <ti/drivers/apps/LED.h>

#if CHIP_CONFIG_ENABLE_ICD_UAT
#include "app/icd/server/ICDNotifier.h"
#include "app/icd/server/ICDNotifier.h" // nogncheck
#endif

/* syscfg */
Expand Down
1 change: 1 addition & 0 deletions examples/tv-casting-app/darwin/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
import("${chip_root}/config/darwin/args.gni")

chip_device_project_config_include = "<CHIPProjectAppConfig.h>"
chip_project_config_include = "<CHIPProjectAppConfig.h>"

chip_project_config_include_dirs = [
"${chip_root}/examples/tv-casting-app/tv-casting-common/include",
Expand Down
6 changes: 5 additions & 1 deletion src/app/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ static_library("interaction-model") {
"${chip_root}/src/app/MessageDef",
"${chip_root}/src/app/data-model-provider",
"${chip_root}/src/app/icd/server:icd-server-config",
"${chip_root}/src/app/icd/server:manager",
"${chip_root}/src/app/icd/server:observer",
"${chip_root}/src/app/util:af-types",
"${chip_root}/src/app/util:callbacks",
Expand All @@ -240,6 +239,10 @@ static_library("interaction-model") {
"${chip_root}/src/system",
]

if (chip_enable_icd_server) {
public_deps += [ "${chip_root}/src/app/icd/server:manager" ]
}

public_configs = [ "${chip_root}/src:includes" ]

if (chip_enable_read_client) {
Expand Down Expand Up @@ -485,6 +488,7 @@ static_library("app") {
":global-attributes",
":interaction-model",
":path-expansion",
":test-event-trigger",
"${chip_root}/src/app/data-model",
"${chip_root}/src/app/data-model-provider",
"${chip_root}/src/app/icd/server:icd-server-config",
Expand Down
13 changes: 0 additions & 13 deletions src/app/chip_data_model.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,6 @@ function(chip_configure_data_model APP_TARGET)
set(APP_GEN_FILES)
endif()

# These are:
# //src/app/icd/server:notfier
# //src/app/icd/server:monitoring-table
# //src/app/icd/server:configuration-data
#
# TODO: ideally we would avoid duplication and would link gn-built items. In this case
# it may be slightly harder because these are source_sets rather than libraries.
target_sources(${APP_TARGET} ${SCOPE}
${CHIP_APP_BASE_DIR}/icd/server/ICDMonitoringTable.cpp
${CHIP_APP_BASE_DIR}/icd/server/ICDNotifier.cpp
${CHIP_APP_BASE_DIR}/icd/server/ICDConfigurationData.cpp
)

# This is:
# //src/app/common:cluster-objects
#
Expand Down
9 changes: 7 additions & 2 deletions src/app/chip_data_model.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("${chip_root}/build/chip/chip_codegen.gni")
import("${chip_root}/src/app/common_flags.gni")
import("${chip_root}/src/app/icd/icd.gni")
import("${chip_root}/src/data-model-providers/codegen/model.gni")
import("${chip_root}/src/platform/python.gni")

Expand Down Expand Up @@ -340,9 +341,13 @@ template("chip_data_model") {
deps += [
"${chip_root}/src/app/icd/server:configuration-data",
"${chip_root}/src/app/icd/server:icd-server-config",
"${chip_root}/src/app/icd/server:monitoring-table",
"${chip_root}/src/app/icd/server:notifier",
]
if (chip_enable_icd_server) {
deps += [ "${chip_root}/src/app/icd/server:notifier" ]
if (chip_enable_icd_checkin) {
deps += [ "${chip_root}/src/app/icd/server:monitoring-table" ]
}
}
} else if (cluster == "resource-monitoring-server") {
sources += [
"${_app_root}/clusters/${cluster}/${cluster}.cpp",
Expand Down
4 changes: 3 additions & 1 deletion src/app/clusters/icd-management-server/icd-management-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
#include <app-common/zap-generated/ids/Clusters.h>
#include <app/AttributeAccessInterface.h>
#include <app/AttributeAccessInterfaceRegistry.h>
#include <app/icd/server/ICDNotifier.h>
#if CHIP_CONFIG_ENABLE_ICD_CIP
#include <app/icd/server/ICDNotifier.h> // nogncheck
#endif
#include <app/server/Server.h>
#include <app/util/attribute-storage.h>

Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/icd-management-server/icd-management-server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#if CHIP_CONFIG_ENABLE_ICD_CIP
#include <app/ConcreteAttributePath.h>
#include <app/icd/server/ICDMonitoringTable.h>
#include <app/icd/server/ICDMonitoringTable.h> // nogncheck
#include <lib/core/CHIPPersistentStorageDelegate.h>
#endif // CHIP_CONFIG_ENABLE_ICD_CIP

Expand Down
10 changes: 3 additions & 7 deletions src/app/server/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,8 @@ static_library("server") {
# be updated if this is not really "testing" even though headers are Test*.h)
public_deps += [ "${chip_root}/src/lib/support:testing" ]

if (chip_enable_icd_server) {
public_deps += [ "${chip_root}/src/app/icd/server:notifier" ]

if (chip_enable_icd_checkin) {
public_deps +=
[ "${chip_root}/src/app/icd/server:default-check-in-back-off" ]
}
if (chip_enable_icd_checkin) {
public_deps +=
[ "${chip_root}/src/app/icd/server:default-check-in-back-off" ]
}
}
Loading