From 5f210bafff9e68eac54d2abf88fd1040edc5a13c Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Fri, 17 Nov 2023 02:21:20 -0500 Subject: [PATCH] Clean up inclusion of private BuildConfig headers (#30531) Certain configuration headers come in pairs CHIPConfig.h & CHIPBuildConfig.h InetConfig.h & InetBuildConfig.h CHIPDeviceConfig.h & CHIPDeviceBuildConfig.h AppConfig.h & AppBuildConfig.h BleConfig.h & BleBuildConfig.h In these cases, the second header is only the portion of the configuration that is generated by the build system and was intended to be private; including it directly may not have expected results. Furthermore, other build systems may not generate the BuildConfig.h headers at all, which was supported through the CHIP_HAVE_CONFIG_H define. Including them directly breaks that capability. Standardize includes on the public headers and tell GN to enforce this. --- examples/air-quality-sensor-app/linux/main.cpp | 2 +- .../chip-tool/commands/common/CHIPCommand.cpp | 2 +- .../chip-tool/commands/common/DeviceScanner.h | 2 +- examples/contact-sensor-app/linux/main.cpp | 2 +- .../commands/common/CHIPCommandBridge.mm | 2 +- .../common/iot_sdk/platform_port.cpp | 2 +- examples/platform/tizen/OptionsProxy.cpp | 4 ++-- .../commands/common/CHIPCommand.cpp | 2 +- src/app/AttributePathParams.h | 2 +- src/app/BUILD.gn | 4 +++- src/app/BufferedReadCallback.h | 2 +- src/app/ClusterStateCache.h | 2 +- src/app/InteractionModelEngine.cpp | 2 +- src/app/InteractionModelEngine.h | 2 +- src/app/MessageDef/AttributeDataIB.h | 2 +- src/app/MessageDef/AttributeDataIBs.h | 2 +- src/app/MessageDef/AttributePathIB.h | 2 +- src/app/MessageDef/AttributePathIBs.h | 2 +- src/app/MessageDef/AttributeReportIB.h | 2 +- src/app/MessageDef/AttributeReportIBs.h | 2 +- src/app/MessageDef/AttributeStatusIB.h | 2 +- src/app/MessageDef/AttributeStatusIBs.h | 2 +- src/app/MessageDef/ClusterPathIB.h | 2 +- src/app/MessageDef/CommandDataIB.h | 2 +- src/app/MessageDef/CommandPathIB.h | 2 +- src/app/MessageDef/CommandStatusIB.h | 2 +- src/app/MessageDef/DataVersionFilterIB.h | 2 +- src/app/MessageDef/DataVersionFilterIBs.h | 2 +- src/app/MessageDef/EventDataIB.h | 2 +- src/app/MessageDef/EventFilterIB.h | 2 +- src/app/MessageDef/EventFilterIBs.h | 2 +- src/app/MessageDef/EventPathIB.h | 2 +- src/app/MessageDef/EventPathIBs.h | 2 +- src/app/MessageDef/EventReportIB.h | 2 +- src/app/MessageDef/EventReportIBs.h | 2 +- src/app/MessageDef/EventStatusIB.h | 2 +- src/app/MessageDef/InvokeRequestMessage.h | 2 +- src/app/MessageDef/InvokeRequests.h | 2 +- src/app/MessageDef/InvokeResponseIB.h | 2 +- src/app/MessageDef/InvokeResponseIBs.h | 2 +- src/app/MessageDef/InvokeResponseMessage.h | 2 +- src/app/MessageDef/MessageDefHelper.h | 2 +- src/app/MessageDef/MessageParser.h | 2 +- src/app/MessageDef/ReadRequestMessage.h | 2 +- src/app/MessageDef/ReportDataMessage.h | 2 +- src/app/MessageDef/StatusIB.h | 2 +- src/app/MessageDef/StatusResponseMessage.h | 2 +- src/app/MessageDef/SubscribeRequestMessage.h | 2 +- src/app/MessageDef/SubscribeResponseMessage.h | 2 +- src/app/MessageDef/TimedRequestMessage.h | 2 +- src/app/ReadClient.h | 2 +- src/app/reporting/ReportSchedulerImpl.cpp | 2 +- src/app/server/Server.h | 2 +- src/ble/BUILD.gn | 8 +++++--- src/controller/CHIPCluster.h | 2 +- src/controller/CHIPDeviceController.h | 2 +- src/controller/ReadInteraction.h | 2 +- src/controller/TypedReadCallback.h | 2 +- src/controller/data_model/BUILD.gn | 2 +- .../java/DeviceAttestationDelegateBridge.h | 2 +- .../CHIP/MTRDeviceAttestationDelegateBridge.h | 2 +- .../Framework/CHIP/MTRDeviceController.mm | 2 +- .../CHIP/MTRDeviceControllerDelegateBridge.h | 2 +- src/include/platform/ConfigurationManager.h | 3 ++- src/include/platform/ConnectivityManager.h | 1 - src/include/platform/DiagnosticDataProvider.h | 2 +- src/include/platform/KeyValueStoreManager.h | 2 +- src/include/platform/LockTracker.h | 2 +- src/include/platform/PlatformManager.h | 2 +- src/inet/BUILD.gn | 11 ++++++----- src/lib/core/BUILD.gn | 5 ++++- src/lib/support/BUILD.gn | 4 +++- src/lib/support/UnitTestUtils.cpp | 2 +- src/platform/BUILD.gn | 17 ++++++++++++++--- src/platform/Tizen/ConfigurationManagerImpl.cpp | 1 - src/platform/Tizen/ConnectivityManagerImpl.cpp | 3 +-- src/platform/Tizen/ConnectivityManagerImpl.h | 3 +-- src/platform/Tizen/DnssdImpl.cpp | 2 +- src/platform/Tizen/Logging.cpp | 2 +- .../Tizen/NetworkCommissioningWiFiDriver.cpp | 2 +- src/platform/Tizen/SystemTimeSupport.cpp | 2 +- src/platform/bouffalolab/common/Logging.cpp | 2 +- src/platform/logging/BUILD.gn | 4 ++-- src/system/BUILD.gn | 8 +++++--- src/transport/BUILD.gn | 1 - src/transport/TraceMessage.h | 2 +- 86 files changed, 119 insertions(+), 100 deletions(-) diff --git a/examples/air-quality-sensor-app/linux/main.cpp b/examples/air-quality-sensor-app/linux/main.cpp index cad641e8971cdd..fddb23fb7b38a6 100644 --- a/examples/air-quality-sensor-app/linux/main.cpp +++ b/examples/air-quality-sensor-app/linux/main.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED #include diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp index fc8295e00e887b..043fbc33ac4f30 100644 --- a/examples/chip-tool/commands/common/CHIPCommand.cpp +++ b/examples/chip-tool/commands/common/CHIPCommand.cpp @@ -19,8 +19,8 @@ #include "CHIPCommand.h" #include -#include #include +#include #include #include #include diff --git a/examples/chip-tool/commands/common/DeviceScanner.h b/examples/chip-tool/commands/common/DeviceScanner.h index 5ea7d036bb3d66..bcdcf26c84feb1 100644 --- a/examples/chip-tool/commands/common/DeviceScanner.h +++ b/examples/chip-tool/commands/common/DeviceScanner.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #if CHIP_DEVICE_LAYER_TARGET_DARWIN diff --git a/examples/contact-sensor-app/linux/main.cpp b/examples/contact-sensor-app/linux/main.cpp index fcc56d7c3d02a4..0b520bdd538e04 100644 --- a/examples/contact-sensor-app/linux/main.cpp +++ b/examples/contact-sensor-app/linux/main.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED #include diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm index eb938c2abb0614..ef99e4fd0deac7 100644 --- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm +++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm @@ -21,7 +21,7 @@ #import "CHIPToolKeypair.h" #import -#include +#include #include #include "MTRError_Utils.h" diff --git a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp index 2326ff96bbec4d..32cf15e2ea7cb3 100644 --- a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp +++ b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/examples/platform/tizen/OptionsProxy.cpp b/examples/platform/tizen/OptionsProxy.cpp index f970887ba140b1..c00ac172e6627d 100644 --- a/examples/platform/tizen/OptionsProxy.cpp +++ b/examples/platform/tizen/OptionsProxy.cpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace { diff --git a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp index 7eb9894a106fd9..e86942e39ac2b0 100644 --- a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp +++ b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/src/app/AttributePathParams.h b/src/app/AttributePathParams.h index fd97a9c083f414..ff1de58cbe91b0 100644 --- a/src/app/AttributePathParams.h +++ b/src/app/AttributePathParams.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn index 17ce830117265c..987bfdcaf2521f 100644 --- a/src/app/BUILD.gn +++ b/src/app/BUILD.gn @@ -62,6 +62,8 @@ buildconfig_header("app_buildconfig") { "ICD_REPORT_ON_ENTER_ACTIVE_MODE=${chip_report_on_active_mode}", "ICD_MAX_NOTIFICATION_SUBSCRIBERS=${icd_max_notification_subscribers}", ] + + visibility = [ ":app_config" ] } source_set("revision_info") { @@ -75,7 +77,7 @@ source_set("revision_info") { source_set("app_config") { sources = [ "AppConfig.h" ] - public_deps = [ ":app_buildconfig" ] + deps = [ ":app_buildconfig" ] } static_library("app") { diff --git a/src/app/BufferedReadCallback.h b/src/app/BufferedReadCallback.h index f8faaaa1a0fd74..b24257884e1a77 100644 --- a/src/app/BufferedReadCallback.h +++ b/src/app/BufferedReadCallback.h @@ -21,7 +21,7 @@ #include "lib/core/TLV.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" -#include +#include #include #include #include diff --git a/src/app/ClusterStateCache.h b/src/app/ClusterStateCache.h index 9955dee0104edc..4c663a2a5fc2f9 100644 --- a/src/app/ClusterStateCache.h +++ b/src/app/ClusterStateCache.h @@ -21,7 +21,7 @@ #include "lib/core/CHIPError.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" -#include +#include #include #include #include diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 541b0902ce90c9..d202dc7d07c062 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -29,7 +29,7 @@ #include "access/RequestPath.h" #include "access/SubjectDescriptor.h" -#include +#include #include #include #include diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h index 0ecf3f6c6b1ec0..ca1fa92f240c58 100644 --- a/src/app/InteractionModelEngine.h +++ b/src/app/InteractionModelEngine.h @@ -26,7 +26,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeDataIB.h b/src/app/MessageDef/AttributeDataIB.h index 9095616df2c2e2..abcff0b5b3c48d 100644 --- a/src/app/MessageDef/AttributeDataIB.h +++ b/src/app/MessageDef/AttributeDataIB.h @@ -22,7 +22,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeDataIBs.h b/src/app/MessageDef/AttributeDataIBs.h index 16d606efd0bacd..b6c211edffca3f 100644 --- a/src/app/MessageDef/AttributeDataIBs.h +++ b/src/app/MessageDef/AttributeDataIBs.h @@ -27,7 +27,7 @@ #include "ArrayParser.h" #include "AttributeDataIB.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributePathIB.h b/src/app/MessageDef/AttributePathIB.h index 6441b18ec59eb9..5035bbd46018c8 100644 --- a/src/app/MessageDef/AttributePathIB.h +++ b/src/app/MessageDef/AttributePathIB.h @@ -21,7 +21,7 @@ #include "ListBuilder.h" #include "ListParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributePathIBs.h b/src/app/MessageDef/AttributePathIBs.h index 7845e7d21e3ea6..c817825f719316 100644 --- a/src/app/MessageDef/AttributePathIBs.h +++ b/src/app/MessageDef/AttributePathIBs.h @@ -22,7 +22,7 @@ #include "ArrayParser.h" #include "AttributePathIB.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeReportIB.h b/src/app/MessageDef/AttributeReportIB.h index f5f8335bd4f4cf..7a9c56f85d4d67 100644 --- a/src/app/MessageDef/AttributeReportIB.h +++ b/src/app/MessageDef/AttributeReportIB.h @@ -22,7 +22,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeReportIBs.h b/src/app/MessageDef/AttributeReportIBs.h index 422a639cce459b..0256f256954b0f 100644 --- a/src/app/MessageDef/AttributeReportIBs.h +++ b/src/app/MessageDef/AttributeReportIBs.h @@ -27,7 +27,7 @@ #include "ArrayParser.h" #include "AttributeReportIB.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeStatusIB.h b/src/app/MessageDef/AttributeStatusIB.h index cf959041b6c977..10f4851cd91a85 100644 --- a/src/app/MessageDef/AttributeStatusIB.h +++ b/src/app/MessageDef/AttributeStatusIB.h @@ -22,7 +22,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/AttributeStatusIBs.h b/src/app/MessageDef/AttributeStatusIBs.h index 03b1d00653463d..edfeec41b2c8bf 100644 --- a/src/app/MessageDef/AttributeStatusIBs.h +++ b/src/app/MessageDef/AttributeStatusIBs.h @@ -22,7 +22,7 @@ #include "ArrayParser.h" #include "AttributeStatusIB.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/ClusterPathIB.h b/src/app/MessageDef/ClusterPathIB.h index 8e78408e9d9c87..65969a0fd78c88 100644 --- a/src/app/MessageDef/ClusterPathIB.h +++ b/src/app/MessageDef/ClusterPathIB.h @@ -20,7 +20,7 @@ #include "ListBuilder.h" #include "ListParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/CommandDataIB.h b/src/app/MessageDef/CommandDataIB.h index a9b3d27cf0a3a6..b3bd2f4181d2c9 100644 --- a/src/app/MessageDef/CommandDataIB.h +++ b/src/app/MessageDef/CommandDataIB.h @@ -23,7 +23,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/CommandPathIB.h b/src/app/MessageDef/CommandPathIB.h index 21aa1e521d2184..ac3ef9e63d23ac 100644 --- a/src/app/MessageDef/CommandPathIB.h +++ b/src/app/MessageDef/CommandPathIB.h @@ -21,7 +21,7 @@ #include "ListBuilder.h" #include "ListParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/CommandStatusIB.h b/src/app/MessageDef/CommandStatusIB.h index 8574937291375d..8614df28cab4b5 100644 --- a/src/app/MessageDef/CommandStatusIB.h +++ b/src/app/MessageDef/CommandStatusIB.h @@ -23,7 +23,7 @@ #include "StatusIB.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/DataVersionFilterIB.h b/src/app/MessageDef/DataVersionFilterIB.h index 33988384482020..ba9c0b19cdbe4f 100644 --- a/src/app/MessageDef/DataVersionFilterIB.h +++ b/src/app/MessageDef/DataVersionFilterIB.h @@ -20,7 +20,7 @@ #include "ClusterPathIB.h" #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/DataVersionFilterIBs.h b/src/app/MessageDef/DataVersionFilterIBs.h index 91be119d84452e..199a6686cb011f 100644 --- a/src/app/MessageDef/DataVersionFilterIBs.h +++ b/src/app/MessageDef/DataVersionFilterIBs.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventDataIB.h b/src/app/MessageDef/EventDataIB.h index 1086a89634c45e..77dcfe77e214fe 100644 --- a/src/app/MessageDef/EventDataIB.h +++ b/src/app/MessageDef/EventDataIB.h @@ -26,7 +26,7 @@ #include "EventPathIB.h" #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventFilterIB.h b/src/app/MessageDef/EventFilterIB.h index 914874684642a3..a2bd4d7f9a72cf 100644 --- a/src/app/MessageDef/EventFilterIB.h +++ b/src/app/MessageDef/EventFilterIB.h @@ -25,7 +25,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventFilterIBs.h b/src/app/MessageDef/EventFilterIBs.h index e3b216c126f483..7c2d7604ff9a2c 100644 --- a/src/app/MessageDef/EventFilterIBs.h +++ b/src/app/MessageDef/EventFilterIBs.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventPathIB.h b/src/app/MessageDef/EventPathIB.h index 2a136631d831a4..f1ce1cb719a370 100644 --- a/src/app/MessageDef/EventPathIB.h +++ b/src/app/MessageDef/EventPathIB.h @@ -21,7 +21,7 @@ #include "ListBuilder.h" #include "ListParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventPathIBs.h b/src/app/MessageDef/EventPathIBs.h index 9ce2e308d0d5ee..5f5c85f85df083 100644 --- a/src/app/MessageDef/EventPathIBs.h +++ b/src/app/MessageDef/EventPathIBs.h @@ -23,7 +23,7 @@ #include "EventPathIB.h" #include "EventPathIBs.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventReportIB.h b/src/app/MessageDef/EventReportIB.h index efafdbef9bf065..3db9d782a6daa1 100644 --- a/src/app/MessageDef/EventReportIB.h +++ b/src/app/MessageDef/EventReportIB.h @@ -22,7 +22,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventReportIBs.h b/src/app/MessageDef/EventReportIBs.h index ebaa12f4647c28..a52001fb7d1f0e 100644 --- a/src/app/MessageDef/EventReportIBs.h +++ b/src/app/MessageDef/EventReportIBs.h @@ -27,7 +27,7 @@ #include "ArrayParser.h" #include "EventReportIB.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/EventStatusIB.h b/src/app/MessageDef/EventStatusIB.h index 8abce827ad6ca8..f0e57a2ba38bac 100644 --- a/src/app/MessageDef/EventStatusIB.h +++ b/src/app/MessageDef/EventStatusIB.h @@ -22,7 +22,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/InvokeRequestMessage.h b/src/app/MessageDef/InvokeRequestMessage.h index 36b32a4c15a5a7..0678e03ec10480 100644 --- a/src/app/MessageDef/InvokeRequestMessage.h +++ b/src/app/MessageDef/InvokeRequestMessage.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/InvokeRequests.h b/src/app/MessageDef/InvokeRequests.h index f82a8a8fa92625..71f9f74c328725 100644 --- a/src/app/MessageDef/InvokeRequests.h +++ b/src/app/MessageDef/InvokeRequests.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/InvokeResponseIB.h b/src/app/MessageDef/InvokeResponseIB.h index 14da578caa571f..17cc90ee6e3d3b 100644 --- a/src/app/MessageDef/InvokeResponseIB.h +++ b/src/app/MessageDef/InvokeResponseIB.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/InvokeResponseIBs.h b/src/app/MessageDef/InvokeResponseIBs.h index 1712c6fd22de8b..2531785fd6fa94 100644 --- a/src/app/MessageDef/InvokeResponseIBs.h +++ b/src/app/MessageDef/InvokeResponseIBs.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/InvokeResponseMessage.h b/src/app/MessageDef/InvokeResponseMessage.h index 1399f747a507b5..87cb7c14746646 100644 --- a/src/app/MessageDef/InvokeResponseMessage.h +++ b/src/app/MessageDef/InvokeResponseMessage.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/MessageDefHelper.h b/src/app/MessageDef/MessageDefHelper.h index b19b41ce9c8eaf..890c5d39b7824d 100644 --- a/src/app/MessageDef/MessageDefHelper.h +++ b/src/app/MessageDef/MessageDefHelper.h @@ -28,7 +28,7 @@ #include #include -#include +#include // We need CHIPLogging.h to get the right value for CHIP_DETAIL_LOGGING here. #include diff --git a/src/app/MessageDef/MessageParser.h b/src/app/MessageDef/MessageParser.h index 6a2c3469f467a4..e307d5b905d965 100644 --- a/src/app/MessageDef/MessageParser.h +++ b/src/app/MessageDef/MessageParser.h @@ -19,7 +19,7 @@ #pragma once #include "StructParser.h" -#include +#include #include #include diff --git a/src/app/MessageDef/ReadRequestMessage.h b/src/app/MessageDef/ReadRequestMessage.h index 880ad9d8bd4d52..2b9391bc4f61ef 100644 --- a/src/app/MessageDef/ReadRequestMessage.h +++ b/src/app/MessageDef/ReadRequestMessage.h @@ -23,7 +23,7 @@ #include "EventPathIBs.h" #include "MessageBuilder.h" #include "MessageParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/ReportDataMessage.h b/src/app/MessageDef/ReportDataMessage.h index a515635ae8500a..57d531258f82e2 100644 --- a/src/app/MessageDef/ReportDataMessage.h +++ b/src/app/MessageDef/ReportDataMessage.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/MessageDef/StatusIB.h b/src/app/MessageDef/StatusIB.h index 6e7a88229f415b..0dadccc58ee527 100644 --- a/src/app/MessageDef/StatusIB.h +++ b/src/app/MessageDef/StatusIB.h @@ -26,7 +26,7 @@ #include "StructBuilder.h" #include "StructParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/StatusResponseMessage.h b/src/app/MessageDef/StatusResponseMessage.h index c4e753eede0781..5440b49b22812f 100644 --- a/src/app/MessageDef/StatusResponseMessage.h +++ b/src/app/MessageDef/StatusResponseMessage.h @@ -18,7 +18,7 @@ #pragma once #include "MessageBuilder.h" #include "MessageParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/SubscribeRequestMessage.h b/src/app/MessageDef/SubscribeRequestMessage.h index 3eeb6686da7c8c..e09abf1bea75ba 100644 --- a/src/app/MessageDef/SubscribeRequestMessage.h +++ b/src/app/MessageDef/SubscribeRequestMessage.h @@ -23,7 +23,7 @@ #include "EventPathIBs.h" #include "MessageBuilder.h" #include "MessageParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/SubscribeResponseMessage.h b/src/app/MessageDef/SubscribeResponseMessage.h index 9d331f7d303020..fc1edc12ed22fd 100644 --- a/src/app/MessageDef/SubscribeResponseMessage.h +++ b/src/app/MessageDef/SubscribeResponseMessage.h @@ -19,7 +19,7 @@ #include "EventPathIBs.h" #include "MessageBuilder.h" #include "MessageParser.h" -#include +#include #include #include #include diff --git a/src/app/MessageDef/TimedRequestMessage.h b/src/app/MessageDef/TimedRequestMessage.h index 4a1d13f670e5f9..cc4b1c48a5628e 100644 --- a/src/app/MessageDef/TimedRequestMessage.h +++ b/src/app/MessageDef/TimedRequestMessage.h @@ -18,7 +18,7 @@ #pragma once #include "MessageBuilder.h" #include "MessageParser.h" -#include +#include #include #include #include diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h index 2ecf84454f3e9d..3d66f5deab02cb 100644 --- a/src/app/ReadClient.h +++ b/src/app/ReadClient.h @@ -24,7 +24,7 @@ #pragma once #include "system/SystemClock.h" -#include +#include #include #include #include diff --git a/src/app/reporting/ReportSchedulerImpl.cpp b/src/app/reporting/ReportSchedulerImpl.cpp index 5c061d1336bc84..ef06ca25442531 100644 --- a/src/app/reporting/ReportSchedulerImpl.cpp +++ b/src/app/reporting/ReportSchedulerImpl.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/src/app/server/Server.h b/src/app/server/Server.h index 7206696ba95f99..018c6f2196eb49 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include diff --git a/src/ble/BUILD.gn b/src/ble/BUILD.gn index 34450c03c4a8ee..a9f2f07419f77f 100644 --- a/src/ble/BUILD.gn +++ b/src/ble/BUILD.gn @@ -42,6 +42,8 @@ buildconfig_header("ble_buildconfig") { defines += [ "BLE_PLATFORM_CONFIG_INCLUDE=${chip_ble_platform_config_include}" ] } + + visibility = [ ":ble_config_header" ] } source_set("ble_config_header") { @@ -49,10 +51,11 @@ source_set("ble_config_header") { public_configs = [ "${chip_root}/src:includes" ] - public_deps = [ + public_deps = [ "${chip_root}/src/system:system_config_header" ] + + deps = [ ":ble_buildconfig", "${chip_root}/src/platform:platform_buildconfig", - "${chip_root}/src/system:system_config_header", ] } @@ -65,7 +68,6 @@ if (chip_config_network_layer_ble) { "BLEEndPoint.h", "Ble.h", "BleApplicationDelegate.h", - "BleConfig.h", "BleConnectionDelegate.h", "BleError.cpp", "BleError.h", diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h index fd355e6f0d473c..f442190c0fc200 100644 --- a/src/controller/CHIPCluster.h +++ b/src/controller/CHIPCluster.h @@ -27,7 +27,7 @@ #pragma once #include "app/ConcreteCommandPath.h" -#include +#include #include #include #include diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 9d6a9d6f5a897c..2919096977f1ac 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -28,7 +28,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/controller/ReadInteraction.h b/src/controller/ReadInteraction.h index f6254f3df4cee4..8eae6613ddf10e 100644 --- a/src/controller/ReadInteraction.h +++ b/src/controller/ReadInteraction.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/controller/TypedReadCallback.h b/src/controller/TypedReadCallback.h index 7823ad312123b1..000b5d51d522ce 100644 --- a/src/controller/TypedReadCallback.h +++ b/src/controller/TypedReadCallback.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn index a30f405b20022c..9c66a57da336c5 100644 --- a/src/controller/data_model/BUILD.gn +++ b/src/controller/data_model/BUILD.gn @@ -272,7 +272,7 @@ if (current_os == "android" || matter_enable_java_compilation) { deps = [ ":data_model", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", ] public_configs = [ ":java-build-config" ] diff --git a/src/controller/java/DeviceAttestationDelegateBridge.h b/src/controller/java/DeviceAttestationDelegateBridge.h index 258a53528eb4e3..214c5d78ec95ae 100644 --- a/src/controller/java/DeviceAttestationDelegateBridge.h +++ b/src/controller/java/DeviceAttestationDelegateBridge.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h index cef43549da5eb0..24bae8325b5212 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h +++ b/src/darwin/Framework/CHIP/MTRDeviceAttestationDelegateBridge.h @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index 94b9a49173a49d..04f92e8e3bdf1a 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -51,7 +51,7 @@ #import "MTRDeviceAttestationDelegateBridge.h" #import "MTRDeviceConnectionBridge.h" -#include +#include #include #include diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h index d13331f46bd2ac..d5b131d21ae8d9 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h @@ -19,7 +19,7 @@ #include #include -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h index 29addac5cb88d4..4ebf2c6edf4d36 100644 --- a/src/include/platform/ConfigurationManager.h +++ b/src/include/platform/ConfigurationManager.h @@ -26,8 +26,9 @@ #include +#include + #if CHIP_HAVE_CONFIG_H -#include #include #endif diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h index d1bbd22a93a3a2..20be5ac9ae6b62 100644 --- a/src/include/platform/ConnectivityManager.h +++ b/src/include/platform/ConnectivityManager.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index 338c43947fb472..a99ca6ee61beb1 100644 --- a/src/include/platform/DiagnosticDataProvider.h +++ b/src/include/platform/DiagnosticDataProvider.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include namespace chip { diff --git a/src/include/platform/KeyValueStoreManager.h b/src/include/platform/KeyValueStoreManager.h index eb24efbb091763..cb777571d486b3 100644 --- a/src/include/platform/KeyValueStoreManager.h +++ b/src/include/platform/KeyValueStoreManager.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/include/platform/LockTracker.h b/src/include/platform/LockTracker.h index 0c240f229c0c03..3e0a7781479462 100644 --- a/src/include/platform/LockTracker.h +++ b/src/include/platform/LockTracker.h @@ -17,7 +17,7 @@ #pragma once -#include +#include /// Defines support for asserting that the chip stack is locked by the current thread via /// the macro: diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h index a0f5abfec4e134..4ce673ec4129c4 100644 --- a/src/include/platform/PlatformManager.h +++ b/src/include/platform/PlatformManager.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn index 3f81be89647e6f..08004fe337d519 100644 --- a/src/inet/BUILD.gn +++ b/src/inet/BUILD.gn @@ -56,6 +56,8 @@ buildconfig_header("inet_buildconfig") { defines += [ "INET_TCP_END_POINT_IMPL_CONFIG_FILE=" ] defines += [ "INET_UDP_END_POINT_IMPL_CONFIG_FILE=" ] + + visibility = [ ":inet_config_header" ] } source_set("inet_config_header") { @@ -63,10 +65,9 @@ source_set("inet_config_header") { public_configs = [ "${chip_root}/src:includes" ] - public_deps = [ - ":inet_buildconfig", - "${chip_root}/src/system:system_config_header", - ] + public_deps = [ "${chip_root}/src/system:system_config_header" ] + + deps = [ ":inet_buildconfig" ] } static_library("inet") { @@ -97,7 +98,7 @@ static_library("inet") { public_deps = [ ":inet_config_header", "${chip_root}/src/lib/support", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", "${chip_root}/src/system", "${nlio_root}:nlio", ] diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn index 60c27502bb0f3c..85f8b8c6449592 100644 --- a/src/lib/core/BUILD.gn +++ b/src/lib/core/BUILD.gn @@ -69,6 +69,8 @@ buildconfig_header("chip_buildconfig") { "CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_WRITE=${chip_tlv_validate_char_string_on_write}", "CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ=${chip_tlv_validate_char_string_on_read}", ] + + visibility = [ ":chip_config_header" ] } source_set("chip_config_header") { @@ -77,12 +79,13 @@ source_set("chip_config_header") { public_configs = [ "${chip_root}/src:includes" ] public_deps = [ - ":chip_buildconfig", "${chip_root}/src/ble:ble_config_header", "${chip_root}/src/inet:inet_config_header", "${chip_root}/src/system:system_config_header", ] + deps = [ ":chip_buildconfig" ] + allow_circular_includes_from = [ "${chip_root}/src/ble:ble_config_header" ] } diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn index 1c44f3191445d5..fde92cc5adbe82 100644 --- a/src/lib/support/BUILD.gn +++ b/src/lib/support/BUILD.gn @@ -251,7 +251,8 @@ static_library("support") { ":verifymacros_no_logging", "${chip_root}/src/lib/core:chip_config_header", "${chip_root}/src/lib/core:error", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", + "${chip_root}/src/system:system_config_header", "${nlassert_root}:nlassert", "${nlio_root}:nlio", ] @@ -311,6 +312,7 @@ static_library("testing") { public_deps = [ ":support", "${chip_root}/src/lib/core", + "${chip_root}/src/platform", "${nlassert_root}:nlassert", "${nlunit_test_root}:nlunit-test", ] diff --git a/src/lib/support/UnitTestUtils.cpp b/src/lib/support/UnitTestUtils.cpp index c63bd5be015596..84976405a20940 100644 --- a/src/lib/support/UnitTestUtils.cpp +++ b/src/lib/support/UnitTestUtils.cpp @@ -18,7 +18,7 @@ #include // Platform specific includes for test_utils -#include +#include #if CHIP_DEVICE_LAYER_TARGET_EFR32 || CHIP_DEVICE_LAYER_TARGET_AMEBA #include #include diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 7a7b6a81e689f5..39d94748c117a6 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -371,6 +371,12 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { } defines += [ "CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES=${chip_max_discovered_ip_addresses}" ] + + visibility = [ + ":platform_config_header", + "${chip_root}/src/ble:ble_config_header", + "${chip_root}/src/system:system_config_header", + ] } } else if (chip_device_platform == "none") { buildconfig_header("platform_buildconfig") { @@ -392,10 +398,16 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { } } +source_set("platform_config_header") { + sources = [ "../include/platform/CHIPDeviceConfig.h" ] + + deps = [ ":platform_buildconfig" ] +} + if (chip_device_platform != "none") { - group("platform_base") { + source_set("platform_base") { public_deps = [ - ":platform_buildconfig", + ":platform_config_header", "${chip_root}/src/ble", "${chip_root}/src/inet", "${chip_root}/src/lib/core", @@ -412,7 +424,6 @@ if (chip_device_platform != "none") { sources = [ "../include/platform/BuildTime.h", - "../include/platform/CHIPDeviceConfig.h", "../include/platform/CHIPDeviceError.h", "../include/platform/CHIPDeviceEvent.h", "../include/platform/CHIPDeviceLayer.h", diff --git a/src/platform/Tizen/ConfigurationManagerImpl.cpp b/src/platform/Tizen/ConfigurationManagerImpl.cpp index 78d556881443a8..8efe079993b7aa 100644 --- a/src/platform/Tizen/ConfigurationManagerImpl.cpp +++ b/src/platform/Tizen/ConfigurationManagerImpl.cpp @@ -26,7 +26,6 @@ #include "ConfigurationManagerImpl.h" #include -#include #include #include #include diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp index 9000ee710c0664..c97196babfbfcf 100644 --- a/src/platform/Tizen/ConnectivityManagerImpl.cpp +++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp @@ -27,10 +27,9 @@ #include #endif -#include +#include #include #include -#include #include #include #include diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h index 04d692a1f05f8f..a22eb71eb7deb2 100644 --- a/src/platform/Tizen/ConnectivityManagerImpl.h +++ b/src/platform/Tizen/ConnectivityManagerImpl.h @@ -21,9 +21,8 @@ #include -#include +#include #include -#include #include #include #include diff --git a/src/platform/Tizen/DnssdImpl.cpp b/src/platform/Tizen/DnssdImpl.cpp index 646d40af5a8f53..64b6d45932e2d2 100644 --- a/src/platform/Tizen/DnssdImpl.cpp +++ b/src/platform/Tizen/DnssdImpl.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/platform/Tizen/Logging.cpp b/src/platform/Tizen/Logging.cpp index da29fc8926ef69..117059e9d15569 100644 --- a/src/platform/Tizen/Logging.cpp +++ b/src/platform/Tizen/Logging.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp index d6501cbde80e38..a92ead9764c203 100644 --- a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/Tizen/SystemTimeSupport.cpp b/src/platform/Tizen/SystemTimeSupport.cpp index bfc33b7dd23a9c..452c9039bfb939 100644 --- a/src/platform/Tizen/SystemTimeSupport.cpp +++ b/src/platform/Tizen/SystemTimeSupport.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/platform/bouffalolab/common/Logging.cpp b/src/platform/bouffalolab/common/Logging.cpp index bc773c530d6bdc..b05912f180f33b 100644 --- a/src/platform/bouffalolab/common/Logging.cpp +++ b/src/platform/bouffalolab/common/Logging.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include diff --git a/src/platform/logging/BUILD.gn b/src/platform/logging/BUILD.gn index 28a787d6e3f6fe..6039b101e20482 100644 --- a/src/platform/logging/BUILD.gn +++ b/src/platform/logging/BUILD.gn @@ -18,7 +18,7 @@ if (current_os == "android") { "${chip_root}/src/lib/core:chip_config_header", "${chip_root}/src/lib/support:attributes", "${chip_root}/src/lib/support:logging_constants", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", "${chip_root}/src/platform/logging:headers", ] @@ -43,7 +43,7 @@ static_library("stdio") { "${chip_root}/src/lib/core:chip_config_header", "${chip_root}/src/lib/support:attributes", "${chip_root}/src/lib/support:logging_constants", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", "${chip_root}/src/platform/logging:headers", ] diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn index 283e3b7c49bcbd..cc0293ea864642 100644 --- a/src/system/BUILD.gn +++ b/src/system/BUILD.gn @@ -166,11 +166,13 @@ source_set("system_config_header") { "${chip_root}/src:includes", ] - public_deps = [ + deps = [ ":system_buildconfig", "${chip_root}/src/platform:platform_buildconfig", ] + public_deps = [] + if (target_cpu != "esp32") { if (chip_system_config_use_lwip) { public_deps += [ "${chip_root}/src/lwip" ] @@ -220,7 +222,6 @@ static_library("system") { "SystemAlignSize.h", "SystemClock.cpp", "SystemClock.h", - "SystemConfig.h", "SystemError.cpp", "SystemError.h", "SystemEvent.h", @@ -253,9 +254,10 @@ static_library("system") { cflags = [ "-Wconversion" ] public_deps = [ + ":system_config_header", "${chip_root}/src/lib/core:error", "${chip_root}/src/lib/support", - "${chip_root}/src/platform:platform_buildconfig", + "${chip_root}/src/platform:platform_config_header", "${nlassert_root}:nlassert", ] diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn index f1f7ef534322a7..33a8f05f8c64df 100644 --- a/src/transport/BUILD.gn +++ b/src/transport/BUILD.gn @@ -60,7 +60,6 @@ static_library("transport") { "${chip_root}/src/crypto", "${chip_root}/src/inet", "${chip_root}/src/lib/core", - "${chip_root}/src/lib/core:chip_buildconfig", "${chip_root}/src/lib/dnssd", "${chip_root}/src/lib/support", "${chip_root}/src/platform", diff --git a/src/transport/TraceMessage.h b/src/transport/TraceMessage.h index d2be9478c53408..943c9c6d7de0c5 100644 --- a/src/transport/TraceMessage.h +++ b/src/transport/TraceMessage.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include #include