From 5c9eb431d2333cf8ecb805d1f53af9fdb2892553 Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Mon, 15 Jan 2024 04:19:21 -0500
Subject: [PATCH] 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 <commits@restyled.io>
---
 .../include/static-supported-temperature-levels.h               | 2 +-
 .../src/static-supported-temperature-levels.cpp                 | 2 +-
 .../placeholder/linux/static-supported-temperature-levels.cpp   | 1 -
 .../include/static-supported-temperature-levels.h               | 2 +-
 .../src/static-supported-temperature-levels.cpp                 | 2 +-
 .../general-diagnostics-server/general-diagnostics-server.cpp   | 2 +-
 src/app/clusters/power-source-server/power-source-server.cpp    | 2 +-
 src/app/clusters/scenes-server/SceneTableImpl.h                 | 2 +-
 8 files changed, 7 insertions(+), 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
index 1ef9f1db0c56ab..50739de0201628 100644
--- 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
index d5352eed7b6367..0a830480fb188c 100644
--- 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
index 14a1087d230a4d..ed80f5490df821 100644
--- 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
index 1ef9f1db0c56ab..50739de0201628 100644
--- 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
index ae7a7dfa72c9ea..a03a98d89feb1f 100644
--- 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
index 0c5cf641268ad9..6f4a5c3e74f5b4 100644
--- 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
index 3baf2df84949f4..037a182dd7a0d6 100644
--- 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
index 753799ec70c68e..01801fd2dd1310 100644
--- 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 {