Move LogV.h to src/include/platform/

Previously, it was placed in src/platform/logging/
project-chip · Jun 27, 2024 · 2712649 · 2712649
1 parent d71a363
commit 2712649
Show file tree

Hide file tree

Showing 72 changed files with 95 additions and 97 deletions.
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
@@ -92,7 +92,7 @@ static_library("chip-tool-utils") {
     sources += [ "commands/interactive/InteractiveCommands.cpp" ]
     deps += [
       "${chip_root}/examples/common/websocket-server",
-      "${chip_root}/src/platform/logging:headers",
+      "${chip_root}/src/platform:logging_header",
       "${editline_root}:editline",
     ]
   }

diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -18,7 +18,7 @@
 
 #include "InteractiveCommands.h"
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <editline.h>
 

diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
@@ -20,7 +20,7 @@
 
 #include <lib/support/Base64.h>
 #include <logging/logging.h>
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <string>
 

diff --git a/examples/fabric-admin/BUILD.gn b/examples/fabric-admin/BUILD.gn
@@ -84,7 +84,7 @@ static_library("fabric-admin-utils") {
 
   sources += [ "commands/interactive/InteractiveCommands.cpp" ]
   deps += [
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${editline_root}:editline",
   ]
 

diff --git a/examples/fabric-admin/commands/interactive/InteractiveCommands.cpp b/examples/fabric-admin/commands/interactive/InteractiveCommands.cpp
@@ -18,7 +18,7 @@
 
 #include "InteractiveCommands.h"
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 #include <system/SystemClock.h>
 
 #include <editline.h>

diff --git a/examples/placeholder/linux/BUILD.gn b/examples/placeholder/linux/BUILD.gn
@@ -41,7 +41,7 @@ executable("chip-${chip_tests_zap_config}") {
     "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
     "${chip_root}/src/lib/support:test_utils",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/third_party/jsoncpp",
   ]
 

diff --git a/examples/placeholder/linux/InteractiveServer.cpp b/examples/placeholder/linux/InteractiveServer.cpp
@@ -22,7 +22,7 @@
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/Base64.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <string>
 #include <vector>

diff --git a/examples/platform/esp32/external_platform/ESP32_custom/BUILD.gn b/examples/platform/esp32/external_platform/ESP32_custom/BUILD.gn
@@ -99,7 +99,7 @@ static_library("ESP32_custom") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 

diff --git a/src/platform/logging/LogV.h → src/include/platform/LogV.h b/src/platform/logging/LogV.h → src/include/platform/LogV.h
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
@@ -127,7 +127,7 @@ source_set("text_only_logging") {
   deps = [
     ":memory",
     "${chip_root}/src/lib/core:chip_config_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
   ]
 }
 

diff --git a/src/lib/support/logging/TextOnlyLogging.cpp b/src/lib/support/logging/TextOnlyLogging.cpp
@@ -27,7 +27,7 @@
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/CHIPMem.h>
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/src/platform/ASR/BUILD.gn b/src/platform/ASR/BUILD.gn
@@ -73,7 +73,7 @@ static_library("ASR") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 
@@ -92,8 +92,8 @@ static_library("ASR") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/ASR/Logging.cpp b/src/platform/ASR/Logging.cpp
@@ -1,5 +1,5 @@
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 #include <stdio.h>
 #if (CFG_EASY_LOG_ENABLE == 1)
 #include "elog.h"

diff --git a/src/platform/Ameba/BUILD.gn b/src/platform/Ameba/BUILD.gn
@@ -55,7 +55,7 @@ static_library("Ameba") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 
@@ -76,8 +76,8 @@ static_library("Ameba") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [
     "Logging.cpp",

diff --git a/src/platform/Ameba/Logging.cpp b/src/platform/Ameba/Logging.cpp
@@ -22,7 +22,7 @@
  *          on the Ameba platform.
  */
 /* this file behaves like a config.h, comes first */
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <core/CHIPConfig.h>
 #include <support/TypeTraits.h>

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -615,3 +615,7 @@ if (chip_device_platform != "none") {
 source_set("syscalls_stub") {
   sources = [ "SyscallStubs.cpp" ]
 }
+
+source_set("logging_header") {
+  public = [ "../include/platform/LogV.h" ]
+}
diff --git a/src/platform/Beken/BUILD.gn b/src/platform/Beken/BUILD.gn
@@ -51,7 +51,7 @@ static_library("Beken") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 
@@ -63,8 +63,8 @@ static_library("Beken") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/Beken/Logging.cpp b/src/platform/Beken/Logging.cpp
@@ -22,7 +22,7 @@
  *          on the Beken platform.
  */
 /* this file behaves like a config.h, comes first */
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <core/CHIPConfig.h>
 #include <support/logging/Constants.h>

diff --git a/src/platform/Darwin/BUILD.gn b/src/platform/Darwin/BUILD.gn
@@ -101,7 +101,7 @@ static_library("Darwin") {
     ":logging",
     ":tracing",
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
     "${chip_root}/src/tracing",
   ]
@@ -158,7 +158,7 @@ static_library("logging") {
     "${chip_root}/src/lib/support:attributes",
     "${chip_root}/src/lib/support:logging_constants",
     "${chip_root}/src/lib/support:span",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
   ]
 
   configs += [ "${chip_root}/src:includes" ]

diff --git a/src/platform/Darwin/LoggingImpl.cpp b/src/platform/Darwin/LoggingImpl.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 namespace chip {
 namespace Logging {

diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
@@ -64,7 +64,7 @@ static_library("ESP32") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 
@@ -211,8 +211,8 @@ static_library("ESP32") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/ESP32/Logging.cpp b/src/platform/ESP32/Logging.cpp
@@ -1,6 +1,6 @@
 /* See Project CHIP LICENSE file for licensing information. */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/logging/Constants.h>

diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn
@@ -92,8 +92,8 @@ static_library("CYW30739") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/Infineon/CYW30739/Logging.cpp b/src/platform/Infineon/CYW30739/Logging.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <lib/support/logging/Constants.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 #include <stdio.h>
 #include <wiced_rtos.h>
 

diff --git a/src/platform/Infineon/CYW30739/cyw30739_platform.gni b/src/platform/Infineon/CYW30739/cyw30739_platform.gni
@@ -51,8 +51,8 @@ template("cyw30739_platform") {
     configs += [ "${matter_wpan_sdk_build_root}:${board}-config" ]
 
     deps = [
+      "${chip_root}/src/platform:logging_header",
       "${chip_root}/src/platform:platform",
-      "${chip_root}/src/platform/logging:headers",
     ]
 
     if (chip_enable_openthread) {

diff --git a/src/platform/Infineon/PSOC6/BUILD.gn b/src/platform/Infineon/PSOC6/BUILD.gn
@@ -68,7 +68,7 @@ static_library("PSOC6") {
 
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/setup_payload",
   ]
 
@@ -80,8 +80,8 @@ static_library("PSOC6") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/Infineon/PSOC6/Logging.cpp b/src/platform/Infineon/PSOC6/Logging.cpp
@@ -1,5 +1,5 @@
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 #include <stdio.h>
 
 namespace chip {

diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
@@ -158,8 +158,8 @@ static_library("Linux") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
 
   if (chip_use_pw_logging) {

diff --git a/src/platform/Linux/Logging.cpp b/src/platform/Linux/Logging.cpp
@@ -1,6 +1,6 @@
 /* See Project CHIP LICENSE file for licensing information. */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/logging/Constants.h>

diff --git a/src/platform/NuttX/BUILD.gn b/src/platform/NuttX/BUILD.gn
@@ -152,8 +152,8 @@ static_library("NuttX") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
 
   if (chip_use_pw_logging) {

diff --git a/src/platform/NuttX/Logging.cpp b/src/platform/NuttX/Logging.cpp
@@ -1,6 +1,6 @@
 /* See Project CHIP LICENSE file for licensing information. */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/logging/Constants.h>

diff --git a/src/platform/Tizen/BUILD.gn b/src/platform/Tizen/BUILD.gn
@@ -68,8 +68,8 @@ static_library("Tizen") {
   deps = [ "${chip_root}/src/setup_payload" ]
 
   public_deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
     "${tizen_root}:tizen",
   ]
 
@@ -115,8 +115,8 @@ static_library("Tizen") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
     "${tizen_root}:tizen",
   ]
   sources = [ "Logging.cpp" ]

diff --git a/src/platform/Tizen/Logging.cpp b/src/platform/Tizen/Logging.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <cstdint>
 #include <cstdio>

diff --git a/src/platform/Zephyr/BUILD.gn b/src/platform/Zephyr/BUILD.gn
@@ -51,7 +51,7 @@ static_library("Zephyr") {
   ]
 
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
-  deps = [ "${chip_root}/src/platform/logging:headers" ]
+  deps = [ "${chip_root}/src/platform:logging_header" ]
 
   if (chip_enable_openthread) {
     sources += [
@@ -86,8 +86,8 @@ static_library("Zephyr") {
 
 source_set("logging") {
   deps = [
+    "${chip_root}/src/platform:logging_header",
     "${chip_root}/src/platform:platform_base",
-    "${chip_root}/src/platform/logging:headers",
   ]
   sources = [ "Logging.cpp" ]
 }
diff --git a/src/platform/Zephyr/Logging.cpp b/src/platform/Zephyr/Logging.cpp
@@ -1,6 +1,6 @@
 /* See Project CHIP LICENSE file for licensing information. */
 
-#include <platform/logging/LogV.h>
+#include <platform/LogV.h>
 
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/logging/Constants.h>

diff --git a/src/platform/bouffalolab/BL602/BUILD.gn b/src/platform/bouffalolab/BL602/BUILD.gn
@@ -68,7 +68,7 @@ static_library("BL602") {
   deps = [
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/lib/dnssd:platform_header",
-    "${chip_root}/src/platform/logging:headers",
+    "${chip_root}/src/platform:logging_header",
   ]
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 }
+1 −1		components/spidriver/spi_master_lobo.c
+7 −7		components/spiffs/spiffs_vfs.c