Stop including CHIPCore.h in lib/support.

project-chip · Sep 13, 2023 · 40255ba · 40255ba
1 parent 80ff286
commit 40255ba
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 18 deletions.
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
@@ -178,14 +178,6 @@ static_library("support") {
     "${nlio_root}:nlio",
   ]
 
-  # These are needed because we include CHIPCore.h, which uses config
-  # options for src/ble and src/inet, however we cannot depend on those
-  # directly as such a dependency is cyclic.
-  public_deps += [
-    "${chip_root}/src/ble:ble_config_header",
-    "${chip_root}/src/inet:inet_config_header",
-  ]
-
   # Android has no 'platform' that provides logging
   if (current_os == "android") {
     public_deps += [ "${chip_root}/src/platform/logging:android" ]

diff --git a/src/lib/support/CHIPArgParser.hpp b/src/lib/support/CHIPArgParser.hpp
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPConfig.h>
 
 #if CHIP_CONFIG_ENABLE_ARG_PARSER
 

diff --git a/src/lib/support/ErrorStr.cpp b/src/lib/support/ErrorStr.cpp
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/support/CodeUtils.h>
 
 namespace chip {

diff --git a/src/lib/support/TestPersistentStorageDelegate.h b/src/lib/support/TestPersistentStorageDelegate.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <algorithm>
-#include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <lib/support/DLLUtil.h>
 #include <lib/support/SafeInt.h>

diff --git a/src/lib/support/ThreadOperationalDataset.h b/src/lib/support/ThreadOperationalDataset.h
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <lib/core/CHIPCore.h>
 #include <lib/support/Span.h>
 
 namespace chip {

diff --git a/src/lib/support/TimeUtils.cpp b/src/lib/support/TimeUtils.cpp
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <type_traits>
 
-#include <lib/core/CHIPCore.h>
+#include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
 
 #include "TimeUtils.h"

diff --git a/src/lib/support/Variant.h b/src/lib/support/Variant.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include <lib/core/CHIPCore.h>
-
 #include <algorithm>
 #include <new>
 #include <tuple>

diff --git a/src/lib/support/logging/CHIPLogging.cpp b/src/lib/support/logging/CHIPLogging.cpp
@@ -25,7 +25,7 @@
 
 #include "CHIPLogging.h"
 
-#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>

diff --git a/src/lib/support/tests/TestCHIPArgParser.cpp b/src/lib/support/tests/TestCHIPArgParser.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPConfig.h>
 #include <lib/support/CHIPArgParser.hpp>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPMemString.h>

diff --git a/src/lib/support/tests/TestErrorStr.cpp b/src/lib/support/tests/TestErrorStr.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPConfig.h>
 
 #include <lib/support/ErrorStr.h>
 #include <lib/support/UnitTestRegistration.h>