Skip to content

Commit fa9bfbd

Browse files
[ICD] Add missing include for the ICD specific defines (project-chip#32386)
* Add missing include to the RMP config * add header to every file that uses ICD defines * add dependency to linux static lib
1 parent 0af9905 commit fa9bfbd

12 files changed

+14
-3
lines changed

src/app/tests/TestReadInteraction.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <app/InteractionModelHelper.h>
3030
#include <app/MessageDef/AttributeReportIBs.h>
3131
#include <app/MessageDef/EventDataIB.h>
32+
#include <app/icd/server/ICDServerConfig.h>
3233
#include <app/reporting/tests/MockReportScheduler.h>
3334
#include <app/tests/AppTestContext.h>
3435
#include <app/util/basic-types.h>

src/include/platform/ThreadStackManager.h

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#pragma once
2525

26+
#include <app/icd/server/ICDServerConfig.h>
27+
2628
#include <app/AttributeAccessInterface.h>
2729
#include <app/util/basic-types.h>
2830
#include <inet/IPAddress.h>

src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#pragma once
2626

2727
#include <app/AttributeAccessInterface.h>
28+
#include <app/icd/server/ICDServerConfig.h>
2829
#include <lib/support/BitFlags.h>
2930
#include <platform/ThreadStackManager.h>
3031

src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#pragma once
2525

26+
#include <app/icd/server/ICDServerConfig.h>
2627
#include <lib/support/logging/CHIPLogging.h>
2728
#include <platform/ConnectivityManager.h>
2829
#include <platform/internal/DeviceNetworkInfo.h>

src/messaging/ReliableMessageMgr.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <errno.h>
2525
#include <inttypes.h>
2626

27+
#include <app/icd/server/ICDServerConfig.h>
2728
#include <lib/support/BitFlags.h>
2829
#include <lib/support/CHIPFaultInjection.h>
2930
#include <lib/support/CodeUtils.h>

src/messaging/ReliableMessageProtocolConfig.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
* for the CHIP Reliable Messaging Protocol.
2222
*
2323
*/
24-
2524
#include <messaging/ReliableMessageMgr.h>
2625

26+
#include <app/icd/server/ICDServerConfig.h>
27+
#include <platform/CHIPDeviceConfig.h>
2728
#include <platform/CHIPDeviceLayer.h>
2829
#include <system/SystemClock.h>
2930

30-
#include <platform/CHIPDeviceConfig.h>
31-
3231
#if CHIP_CONFIG_ENABLE_ICD_SERVER
3332
#include <app/icd/server/ICDConfigurationData.h> // nogncheck
3433
#endif

src/messaging/tests/TestAbortExchangesForFabric.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* one) for a fabric.
2222
*/
2323

24+
#include <app/icd/server/ICDServerConfig.h>
2425
#include <lib/support/UnitTestContext.h>
2526
#include <lib/support/UnitTestRegistration.h>
2627
#include <lib/support/UnitTestUtils.h>

src/messaging/tests/TestReliableMessageProtocol.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* implementation.
2323
*/
2424

25+
#include <app/icd/server/ICDServerConfig.h>
2526
#include <lib/core/CHIPCore.h>
2627
#include <lib/support/CodeUtils.h>
2728
#include <lib/support/UnitTestContext.h>

src/platform/Linux/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static_library("Linux") {
7474
]
7575

7676
deps = [
77+
"${chip_root}/src/app/icd/server:icd-server-config",
7778
"${chip_root}/src/credentials:credentials_header",
7879
"${chip_root}/src/setup_payload",
7980
]

src/platform/Linux/ThreadStackManagerImpl.h

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <vector>
2222

2323
#include <app/AttributeAccessInterface.h>
24+
#include <app/icd/server/ICDServerConfig.h>
2425
#include <lib/support/ThreadOperationalDataset.h>
2526
#include <platform/GLibTypeDeleter.h>
2627
#include <platform/Linux/dbus/openthread/introspect.h>

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <openthread/dns_client.h>
3838
#endif
3939

40+
#include <app/icd/server/ICDServerConfig.h>
4041
#include <lib/dnssd/Advertiser.h>
4142
#include <lib/dnssd/platform/Dnssd.h>
4243
#include <platform/NetworkCommissioning.h>

src/protocols/secure_channel/tests/TestPASESession.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <errno.h>
2525
#include <nlunit-test.h>
2626

27+
#include <app/icd/server/ICDServerConfig.h>
2728
#include <lib/core/CHIPCore.h>
2829
#include <lib/core/CHIPSafeCasts.h>
2930
#include <lib/support/CHIPMem.h>

0 commit comments

Comments
 (0)