From 27126497d372c264786e257ed3dadfaae15de645 Mon Sep 17 00:00:00 2001 From: Maksymilian Knust Date: Thu, 27 Jun 2024 10:57:50 +0200 Subject: [PATCH] Move LogV.h to src/include/platform/ Previously, it was placed in src/platform/logging/ --- examples/chip-tool/BUILD.gn | 2 +- .../commands/interactive/InteractiveCommands.cpp | 2 +- examples/common/m5stack-tft/repo | 2 +- .../commands/interactive/InteractiveCommands.mm | 2 +- examples/fabric-admin/BUILD.gn | 2 +- .../commands/interactive/InteractiveCommands.cpp | 2 +- examples/placeholder/linux/BUILD.gn | 2 +- examples/placeholder/linux/InteractiveServer.cpp | 2 +- .../esp32/external_platform/ESP32_custom/BUILD.gn | 2 +- src/{platform/logging => include/platform}/LogV.h | 0 src/lib/support/BUILD.gn | 2 +- src/lib/support/logging/TextOnlyLogging.cpp | 2 +- src/platform/ASR/BUILD.gn | 4 ++-- src/platform/ASR/Logging.cpp | 2 +- src/platform/Ameba/BUILD.gn | 4 ++-- src/platform/Ameba/Logging.cpp | 2 +- src/platform/BUILD.gn | 4 ++++ src/platform/Beken/BUILD.gn | 4 ++-- src/platform/Beken/Logging.cpp | 2 +- src/platform/Darwin/BUILD.gn | 4 ++-- src/platform/Darwin/LoggingImpl.cpp | 2 +- src/platform/ESP32/BUILD.gn | 4 ++-- src/platform/ESP32/Logging.cpp | 2 +- src/platform/Infineon/CYW30739/BUILD.gn | 2 +- src/platform/Infineon/CYW30739/Logging.cpp | 2 +- src/platform/Infineon/CYW30739/cyw30739_platform.gni | 2 +- src/platform/Infineon/PSOC6/BUILD.gn | 4 ++-- src/platform/Infineon/PSOC6/Logging.cpp | 2 +- src/platform/Linux/BUILD.gn | 2 +- src/platform/Linux/Logging.cpp | 2 +- src/platform/NuttX/BUILD.gn | 2 +- src/platform/NuttX/Logging.cpp | 2 +- src/platform/Tizen/BUILD.gn | 4 ++-- src/platform/Tizen/Logging.cpp | 2 +- src/platform/Zephyr/BUILD.gn | 4 ++-- src/platform/Zephyr/Logging.cpp | 2 +- src/platform/bouffalolab/BL602/BUILD.gn | 2 +- src/platform/bouffalolab/BL702/BUILD.gn | 2 +- src/platform/bouffalolab/BL702L/BUILD.gn | 2 +- src/platform/bouffalolab/common/BUILD.gn | 2 +- src/platform/bouffalolab/common/Logging.cpp | 2 +- src/platform/cc13xx_26xx/Logging.cpp | 2 +- src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn | 4 ++-- src/platform/logging/BUILD.gn | 10 ++-------- src/platform/logging/impl/android/Logging.cpp | 2 +- src/platform/logging/impl/stdio/Logging.cpp | 2 +- src/platform/mbed/BUILD.gn | 4 ++-- src/platform/mbed/Logging.cpp | 2 +- src/platform/mt793x/BUILD.gn | 4 ++-- src/platform/mt793x/Logging.cpp | 2 +- src/platform/nrfconnect/BUILD.gn | 4 ++-- src/platform/nxp/BUILD.gn | 2 +- src/platform/nxp/common/Logging.cpp | 4 ++-- src/platform/nxp/k32w/k32w0/BUILD.gn | 2 +- src/platform/nxp/k32w/k32w0/Logging.cpp | 2 +- src/platform/nxp/k32w/k32w1/BUILD.gn | 2 +- src/platform/nxp/k32w/k32w1/Logging.cpp | 2 +- src/platform/nxp/mw320/BUILD.gn | 4 ++-- src/platform/nxp/mw320/Logging.cpp | 2 +- src/platform/nxp/rt/rw61x/BUILD.gn | 2 +- src/platform/nxp/zephyr/BUILD.gn | 2 +- src/platform/openiotsdk/BUILD.gn | 4 ++-- src/platform/openiotsdk/Logging.cpp | 2 +- src/platform/qpg/BUILD.gn | 4 ++-- src/platform/qpg/Logging.cpp | 2 +- src/platform/silabs/Logging.cpp | 2 +- src/platform/silabs/SiWx917/BUILD.gn | 4 ++-- src/platform/silabs/efr32/BUILD.gn | 4 ++-- src/platform/stm32/BUILD.gn | 2 +- src/platform/telink/BUILD.gn | 4 ++-- src/platform/webos/BUILD.gn | 4 ++-- src/platform/webos/Logging.cpp | 2 +- 72 files changed, 95 insertions(+), 97 deletions(-) rename src/{platform/logging => include/platform}/LogV.h (100%) diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn index b5917f3bfaca62..c2a87069c8588d 100644 --- 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 index 92861f7711d566..bf1467ab56f7df 100644 --- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp +++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp @@ -18,7 +18,7 @@ #include "InteractiveCommands.h" -#include +#include #include diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo index d99f5ef8df180a..a6299b6c7c0b2e 160000 --- a/examples/common/m5stack-tft/repo +++ b/examples/common/m5stack-tft/repo @@ -1 +1 @@ -Subproject commit d99f5ef8df180ab34b3d9fff6888d5bede7665c5 +Subproject commit a6299b6c7c0b2e3eb62fa08ee4bf7155c39bad1f diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm index 2652e2c2364101..19927177a9f169 100644 --- a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm +++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/examples/fabric-admin/BUILD.gn b/examples/fabric-admin/BUILD.gn index 9ab444d5f8dc9c..d73a54f5ba1a70 100644 --- 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 index cd63510ab2215e..d630c84b0327cb 100644 --- a/examples/fabric-admin/commands/interactive/InteractiveCommands.cpp +++ b/examples/fabric-admin/commands/interactive/InteractiveCommands.cpp @@ -18,7 +18,7 @@ #include "InteractiveCommands.h" -#include +#include #include #include diff --git a/examples/placeholder/linux/BUILD.gn b/examples/placeholder/linux/BUILD.gn index 089d223c0cd52d..9ebcc9de1144f1 100644 --- 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 index 10d82ba5a902bc..edb1c6be637425 100644 --- a/examples/placeholder/linux/InteractiveServer.cpp +++ b/examples/placeholder/linux/InteractiveServer.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/examples/platform/esp32/external_platform/ESP32_custom/BUILD.gn b/examples/platform/esp32/external_platform/ESP32_custom/BUILD.gn index d8d2f92b542ac7..18f44c54a11489 100644 --- 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 b/src/include/platform/LogV.h similarity index 100% rename from src/platform/logging/LogV.h rename to src/include/platform/LogV.h diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn index 63b1c7cdde5b0a..0567236aa5d858 100644 --- 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 index 0e420140524662..a0c268f803dc20 100644 --- a/src/lib/support/logging/TextOnlyLogging.cpp +++ b/src/lib/support/logging/TextOnlyLogging.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/src/platform/ASR/BUILD.gn b/src/platform/ASR/BUILD.gn index 24a819f35f62eb..62f6acc850ad69 100755 --- 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 index 1fc0114fc3bdce..228fdfcbedf1eb 100644 --- a/src/platform/ASR/Logging.cpp +++ b/src/platform/ASR/Logging.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #if (CFG_EASY_LOG_ENABLE == 1) #include "elog.h" diff --git a/src/platform/Ameba/BUILD.gn b/src/platform/Ameba/BUILD.gn index 69bf149fee4a82..4ba0eae6732f49 100755 --- 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 index edafd0f8a962e6..2760eff9524f67 100644 --- 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 +#include #include #include diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 474e3c17ce284b..09e27c37855123 100644 --- 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 index 903379b93608d3..16e7a07eee66db 100755 --- 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 index 98e5afe1d58e7d..6253230e8d4a5b 100644 --- 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 +#include #include #include diff --git a/src/platform/Darwin/BUILD.gn b/src/platform/Darwin/BUILD.gn index df4c0774e91627..db095ffd372b11 100644 --- 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 index 2d6c1b3b744294..17648961911864 100644 --- a/src/platform/Darwin/LoggingImpl.cpp +++ b/src/platform/Darwin/LoggingImpl.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include namespace chip { namespace Logging { diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn index 2d5d9449b2243e..30d98342dafdd5 100644 --- 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 index e8e53aa9e6275d..888a1c49637e1a 100644 --- 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 +#include #include #include diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn index ec9aeeda99491c..0abf1acea4451f 100644 --- 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 index d49d4e919b3cb1..b430ad47a65137 100644 --- a/src/platform/Infineon/CYW30739/Logging.cpp +++ b/src/platform/Infineon/CYW30739/Logging.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/Infineon/CYW30739/cyw30739_platform.gni b/src/platform/Infineon/CYW30739/cyw30739_platform.gni index 9854a590b99841..69b686d3260d95 100644 --- 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 index bc048a31d3a9b7..19b9eba730d350 100644 --- 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 index ab6af699ac3a17..b2e1e0f8529c13 100644 --- a/src/platform/Infineon/PSOC6/Logging.cpp +++ b/src/platform/Infineon/PSOC6/Logging.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include namespace chip { diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn index 35b5047c9f4c00..bdec608bdb45b1 100644 --- 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 index 25e132e1a12b76..9f408ede70411e 100644 --- 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 +#include #include #include diff --git a/src/platform/NuttX/BUILD.gn b/src/platform/NuttX/BUILD.gn index 346c7d60ed0bdf..dcba075d04d120 100644 --- 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 index ea95fdc4fbc7ef..1deb7ae8352916 100644 --- 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 +#include #include #include diff --git a/src/platform/Tizen/BUILD.gn b/src/platform/Tizen/BUILD.gn index 1bd7af3bc0b35f..25d1c34c4a3d1a 100644 --- 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 index cfedc7fd56d031..ccda873b24e2ba 100644 --- a/src/platform/Tizen/Logging.cpp +++ b/src/platform/Tizen/Logging.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/src/platform/Zephyr/BUILD.gn b/src/platform/Zephyr/BUILD.gn index f271d2ea7edf74..36ec3f8df730e2 100644 --- 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 index a5c1ad7b063d03..ec5fe34e7bc50f 100644 --- 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 +#include #include #include diff --git a/src/platform/bouffalolab/BL602/BUILD.gn b/src/platform/bouffalolab/BL602/BUILD.gn index 215131d87be32d..6e49bef82201fe 100644 --- 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" ] } diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn index 7bf2b615d42294..9e5a01c202d8ed 100644 --- a/src/platform/bouffalolab/BL702/BUILD.gn +++ b/src/platform/bouffalolab/BL702/BUILD.gn @@ -58,7 +58,7 @@ static_library("BL702") { ] } - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] defines = [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ] diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn index d688878c6ceb82..b3f70defccefd7 100644 --- a/src/platform/bouffalolab/BL702L/BUILD.gn +++ b/src/platform/bouffalolab/BL702L/BUILD.gn @@ -56,7 +56,7 @@ static_library("BL702L") { ] } - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] defines = [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ] diff --git a/src/platform/bouffalolab/common/BUILD.gn b/src/platform/bouffalolab/common/BUILD.gn index bf4c8cfa7778ab..4e3bb68a26917b 100644 --- a/src/platform/bouffalolab/common/BUILD.gn +++ b/src/platform/bouffalolab/common/BUILD.gn @@ -16,8 +16,8 @@ import("//build_overrides/chip.gni") 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/bouffalolab/common/Logging.cpp b/src/platform/bouffalolab/common/Logging.cpp index b05912f180f33b..665ff5a1d89fdf 100644 --- a/src/platform/bouffalolab/common/Logging.cpp +++ b/src/platform/bouffalolab/common/Logging.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/src/platform/cc13xx_26xx/Logging.cpp b/src/platform/cc13xx_26xx/Logging.cpp index b467a56909c0b0..ce96e5260821fa 100644 --- a/src/platform/cc13xx_26xx/Logging.cpp +++ b/src/platform/cc13xx_26xx/Logging.cpp @@ -1,6 +1,6 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn index 0684d4eec8cde2..39a2ab365349c6 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn @@ -47,7 +47,7 @@ static_library("cc13x4_26x4") { "SystemPlatformConfig.h", ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] public = [ "${chip_root}/src/credentials/CHIPCert.h", @@ -107,8 +107,8 @@ static_library("cc13x4_26x4") { source_set("logging") { deps = [ ":cc13x4_26x4", # TODO: is this necessary? + "${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/logging/BUILD.gn b/src/platform/logging/BUILD.gn index 632c4ee5353224..2f9d42df055895 100644 --- a/src/platform/logging/BUILD.gn +++ b/src/platform/logging/BUILD.gn @@ -83,20 +83,15 @@ source_set("default") { } } -source_set("headers") { - public = [ "LogV.h" ] -} - if (current_os == "android") { static_library("android") { sources = [ "impl/android/Logging.cpp" ] deps = [ - ":headers", "${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:logging_header", "${chip_root}/src/platform:platform_config_header", - "${chip_root}/src/platform/logging:headers", ] libs = [ "log" ] @@ -112,12 +107,11 @@ source_set("stdio") { sources = [ "impl/stdio/Logging.cpp" ] deps = [ - ":headers", "${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:logging_header", "${chip_root}/src/platform:platform_config_header", - "${chip_root}/src/platform/logging:headers", ] # Ensure we end up with the expected output file name diff --git a/src/platform/logging/impl/android/Logging.cpp b/src/platform/logging/impl/android/Logging.cpp index 404c76f803ba12..63ce04ae4834a9 100644 --- a/src/platform/logging/impl/android/Logging.cpp +++ b/src/platform/logging/impl/android/Logging.cpp @@ -1,6 +1,6 @@ /* See Project chip LICENSE file for licensing information. */ -#include +#include #include diff --git a/src/platform/logging/impl/stdio/Logging.cpp b/src/platform/logging/impl/stdio/Logging.cpp index 26e050f0286f9f..fb6c0e36236bdb 100644 --- a/src/platform/logging/impl/stdio/Logging.cpp +++ b/src/platform/logging/impl/stdio/Logging.cpp @@ -1,6 +1,6 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include diff --git a/src/platform/mbed/BUILD.gn b/src/platform/mbed/BUILD.gn index f73a39f853109d..eb3ad8d9dc2a8f 100644 --- a/src/platform/mbed/BUILD.gn +++ b/src/platform/mbed/BUILD.gn @@ -39,7 +39,7 @@ static_library("mbed") { ] 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_wifi) { sources += [ @@ -53,8 +53,8 @@ static_library("mbed") { 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/mbed/Logging.cpp b/src/platform/mbed/Logging.cpp index 0e03fa81259520..642c9e4bf19fc5 100644 --- a/src/platform/mbed/Logging.cpp +++ b/src/platform/mbed/Logging.cpp @@ -21,7 +21,7 @@ * Logging implementation for Mbed platform */ -#include +#include #include #include diff --git a/src/platform/mt793x/BUILD.gn b/src/platform/mt793x/BUILD.gn index 3071988a280e67..9bdb9ddca47fff 100644 --- a/src/platform/mt793x/BUILD.gn +++ b/src/platform/mt793x/BUILD.gn @@ -64,7 +64,7 @@ static_library("mt793x") { public_deps += [ "${chip_root}/third_party/mt793x_sdk/mDNSResponder" ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] # mDNS if (chip_mdns == "platform") { @@ -82,8 +82,8 @@ static_library("mt793x") { 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/mt793x/Logging.cpp b/src/platform/mt793x/Logging.cpp index 3fb9940187a7ed..360a8e2db71660 100644 --- a/src/platform/mt793x/Logging.cpp +++ b/src/platform/mt793x/Logging.cpp @@ -1,5 +1,5 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn index 9be90fe6b7b0da..138315240c2c33 100644 --- a/src/platform/nrfconnect/BUILD.gn +++ b/src/platform/nrfconnect/BUILD.gn @@ -60,7 +60,7 @@ static_library("nrfconnect") { ] 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_factory_data) { sources += [ @@ -135,8 +135,8 @@ static_library("nrfconnect") { source_set("logging") { deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] sources = [ "../Zephyr/Logging.cpp" ] } diff --git a/src/platform/nxp/BUILD.gn b/src/platform/nxp/BUILD.gn index b60e57af6a4353..841effbdc8a374 100644 --- a/src/platform/nxp/BUILD.gn +++ b/src/platform/nxp/BUILD.gn @@ -22,8 +22,8 @@ group("nxp") { source_set("logging") { public_deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform", - "${chip_root}/src/platform/logging:headers", ] if (nxp_platform == "k32w/k32w0" || nxp_platform == "k32w/k32w1") { diff --git a/src/platform/nxp/common/Logging.cpp b/src/platform/nxp/common/Logging.cpp index 671a8dcbb123ef..77c6a6009b7603 100644 --- a/src/platform/nxp/common/Logging.cpp +++ b/src/platform/nxp/common/Logging.cpp @@ -17,11 +17,11 @@ * limitations under the License. */ #include -#include +#include #include "fsl_debug_console.h" #include -#include +#include #include #include diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn index 76af2760bc9051..0dc30e3b09951f 100644 --- a/src/platform/nxp/k32w/k32w0/BUILD.gn +++ b/src/platform/nxp/k32w/k32w0/BUILD.gn @@ -105,7 +105,7 @@ static_library("nxp_platform") { } } - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] public_deps = [ "${chip_root}/src/app:test-event-trigger", diff --git a/src/platform/nxp/k32w/k32w0/Logging.cpp b/src/platform/nxp/k32w/k32w0/Logging.cpp index 2a9c0816b0facd..792693ab1a4e87 100644 --- a/src/platform/nxp/k32w/k32w0/Logging.cpp +++ b/src/platform/nxp/k32w/k32w0/Logging.cpp @@ -1,6 +1,6 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include diff --git a/src/platform/nxp/k32w/k32w1/BUILD.gn b/src/platform/nxp/k32w/k32w1/BUILD.gn index 028bd2a1cde4a1..82e8a0c2a4c0c7 100644 --- a/src/platform/nxp/k32w/k32w1/BUILD.gn +++ b/src/platform/nxp/k32w/k32w1/BUILD.gn @@ -148,6 +148,6 @@ static_library("nxp_platform") { public_deps += [ "${chip_root}/src/crypto", - "${chip_root}/src/platform/logging:headers", + "${chip_root}/src/platform:logging_header", ] } diff --git a/src/platform/nxp/k32w/k32w1/Logging.cpp b/src/platform/nxp/k32w/k32w1/Logging.cpp index 8f8aedd66741f8..ec103d5cf49827 100644 --- a/src/platform/nxp/k32w/k32w1/Logging.cpp +++ b/src/platform/nxp/k32w/k32w1/Logging.cpp @@ -1,6 +1,6 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include diff --git a/src/platform/nxp/mw320/BUILD.gn b/src/platform/nxp/mw320/BUILD.gn index 6b2729b8474872..fa1ad465755ff2 100644 --- a/src/platform/nxp/mw320/BUILD.gn +++ b/src/platform/nxp/mw320/BUILD.gn @@ -73,7 +73,7 @@ static_library("mw320") { # Use ethernet/wifi interface for network commissioning. Default: WiFi defines += [ "USE_ETHERNET_COMMISSION=0" ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] public_deps = [ "${chip_root}/src/platform:platform_base" ] @@ -95,8 +95,8 @@ static_library("mw320") { 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/nxp/mw320/Logging.cpp b/src/platform/nxp/mw320/Logging.cpp index 40c3c787ff1194..de50b0b0efa056 100644 --- a/src/platform/nxp/mw320/Logging.cpp +++ b/src/platform/nxp/mw320/Logging.cpp @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn index 0e3558b8bf916a..893ccc74b33349 100644 --- a/src/platform/nxp/rt/rw61x/BUILD.gn +++ b/src/platform/nxp/rt/rw61x/BUILD.gn @@ -85,7 +85,7 @@ static_library("nxp_platform") { 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_ble) { sources += [ diff --git a/src/platform/nxp/zephyr/BUILD.gn b/src/platform/nxp/zephyr/BUILD.gn index 291b84d3b03b29..14a0a664b2070e 100644 --- a/src/platform/nxp/zephyr/BUILD.gn +++ b/src/platform/nxp/zephyr/BUILD.gn @@ -65,7 +65,7 @@ static_library("nxp_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_factory_data) { sources += [ diff --git a/src/platform/openiotsdk/BUILD.gn b/src/platform/openiotsdk/BUILD.gn index 51ffe33bbe8e32..e2d25a2d405e29 100644 --- a/src/platform/openiotsdk/BUILD.gn +++ b/src/platform/openiotsdk/BUILD.gn @@ -74,7 +74,7 @@ static_library("openiotsdk") { "${chip_root}/src/platform:platform_base", ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] if (chip_enable_ota_requestor) { sources += [ @@ -89,8 +89,8 @@ static_library("openiotsdk") { source_set("logging") { public_deps = [ ":openiotsdk", + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] sources = [ "${chip_root}/src/platform/openiotsdk/Logging.cpp" ] } diff --git a/src/platform/openiotsdk/Logging.cpp b/src/platform/openiotsdk/Logging.cpp index 2d3eb359bfd65e..0c6317241286bb 100644 --- a/src/platform/openiotsdk/Logging.cpp +++ b/src/platform/openiotsdk/Logging.cpp @@ -22,7 +22,7 @@ * for Open IOT SDK platform. */ -#include +#include #include #include diff --git a/src/platform/qpg/BUILD.gn b/src/platform/qpg/BUILD.gn index d9983ae6bcec66..2d2891318a2069 100644 --- a/src/platform/qpg/BUILD.gn +++ b/src/platform/qpg/BUILD.gn @@ -49,7 +49,7 @@ static_library("qpg") { "qpgConfig.h", ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] public = [ "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h" ] @@ -92,8 +92,8 @@ static_library("qpg") { 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/qpg/Logging.cpp b/src/platform/qpg/Logging.cpp index 549b92b9df5908..e32e38ecdf0a76 100644 --- a/src/platform/qpg/Logging.cpp +++ b/src/platform/qpg/Logging.cpp @@ -1,5 +1,5 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include "qvCHIP.h" diff --git a/src/platform/silabs/Logging.cpp b/src/platform/silabs/Logging.cpp index 3777c96148fb75..b0cfd1ffd2ea20 100644 --- a/src/platform/silabs/Logging.cpp +++ b/src/platform/silabs/Logging.cpp @@ -1,5 +1,5 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn index 27df228be44222..5de6dafe70b60e 100644 --- a/src/platform/silabs/SiWx917/BUILD.gn +++ b/src/platform/silabs/SiWx917/BUILD.gn @@ -76,7 +76,7 @@ static_library("SiWx917") { "${chip_root}/src/app/icd/server:icd-server-config", "${chip_root}/src/platform:platform_base", ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ "${chip_root}/src/platform:logging_header" ] # Add platform crypto implementation if (chip_crypto == "platform") { @@ -101,7 +101,7 @@ static_library("SiWx917") { source_set("logging") { sources = [ "${chip_root}/src/platform/silabs/Logging.cpp" ] deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] } diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn index 5d661886d54f21..d13696ba920091 100644 --- a/src/platform/silabs/efr32/BUILD.gn +++ b/src/platform/silabs/efr32/BUILD.gn @@ -95,8 +95,8 @@ static_library("efr32") { } public_deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] deps = [ "${silabs_platform_dir}/provision:provision-headers" ] public_configs = [] @@ -166,7 +166,7 @@ static_library("efr32") { source_set("logging") { sources = [ "${chip_root}/src/platform/silabs/Logging.cpp" ] deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] } diff --git a/src/platform/stm32/BUILD.gn b/src/platform/stm32/BUILD.gn index 9b2ed9008c858a..3cda68f5e8e496 100644 --- a/src/platform/stm32/BUILD.gn +++ b/src/platform/stm32/BUILD.gn @@ -69,7 +69,7 @@ static_library("stm32") { "SystemPlatformConfig.h", ] - deps += [ "${chip_root}/src/platform/logging:headers" ] + deps += [ "${chip_root}/src/platform:logging_header" ] } public = [ diff --git a/src/platform/telink/BUILD.gn b/src/platform/telink/BUILD.gn index 4857c048afc178..0a6fd194abbba2 100644 --- a/src/platform/telink/BUILD.gn +++ b/src/platform/telink/BUILD.gn @@ -56,7 +56,7 @@ static_library("telink") { ] 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_factory_data) { sources += [ @@ -119,8 +119,8 @@ static_library("telink") { source_set("logging") { deps = [ + "${chip_root}/src/platform:logging_header", "${chip_root}/src/platform:platform_base", - "${chip_root}/src/platform/logging:headers", ] sources = [ "../Zephyr/Logging.cpp" ] } diff --git a/src/platform/webos/BUILD.gn b/src/platform/webos/BUILD.gn index 503bd216c4e816..32062b59d8fe73 100644 --- a/src/platform/webos/BUILD.gn +++ b/src/platform/webos/BUILD.gn @@ -100,7 +100,7 @@ static_library("webos") { ] deps = [ - "${chip_root}/src/platform/logging:headers", + "${chip_root}/src/platform:logging_header", "${chip_root}/src/setup_payload", ] @@ -155,8 +155,8 @@ static_library("webos") { 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/webos/Logging.cpp b/src/platform/webos/Logging.cpp index 6d4ceb91ea3579..f90065fe95a1a2 100644 --- a/src/platform/webos/Logging.cpp +++ b/src/platform/webos/Logging.cpp @@ -1,6 +1,6 @@ /* See Project CHIP LICENSE file for licensing information. */ -#include +#include #include #include