Do not use gen_config.h directly. (#31401)

* Do not use gen_config.h directly. Apparently the right file is config.h, which includes the gen file. * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Feb 26, 2024 · 79b0e92 · 79b0e92
1 parent f3e80dd
commit 79b0e92
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
@@ -20,7 +20,7 @@
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <app/util/af.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 namespace chip {
 namespace app {

diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp
@@ -16,8 +16,8 @@
  *    limitations under the License.
  */
 
+#include <app/util/config.h>
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
 
 using namespace std;
 using namespace chip;

diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp
@@ -18,7 +18,6 @@
 
 #include <app/util/config.h>
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
 
 using namespace std;
 using namespace chip;

diff --git a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
@@ -20,7 +20,7 @@
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <app/util/af.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 namespace chip {
 namespace app {

diff --git a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp
@@ -16,8 +16,8 @@
  *    limitations under the License.
  */
 
+#include <app/util/config.h>
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
 
 using namespace std;
 using namespace chip;

diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -17,7 +17,7 @@
 
 #include "general-diagnostics-server.h"
 
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 #ifdef ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_SERVER
 // Need the `nogncheck` because it's inter-cluster dependency and this

diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp
@@ -25,9 +25,9 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <zap-generated/gen_config.h>
 
 using namespace chip;
 using namespace app;

diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h
@@ -20,11 +20,11 @@
 #include <app/clusters/scenes-server/SceneHandlerImpl.h>
 #include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/CommonIterator.h>
 #include <lib/support/PersistentData.h>
 #include <lib/support/Pool.h>
-#include <zap-generated/gen_config.h>
 
 namespace chip {
 namespace scenes {