Force include lib/ files with full path

project-chip · Sep 1, 2021 · 0af4f8c · 0af4f8c
1 parent 3bbbc69
commit 0af4f8c
Show file tree

Hide file tree

Showing 873 changed files with 2,037 additions and 2,048 deletions.
diff --git a/examples/all-clusters-app/esp32/main/Button.cpp b/examples/all-clusters-app/esp32/main/Button.cpp
@@ -29,8 +29,8 @@
 #include "esp_system.h"
 
 #include "Button.h"
+#include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <support/CodeUtils.h>
 
 extern const char * TAG;
 

diff --git a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp
@@ -26,10 +26,10 @@
 
 #include "CHIPDeviceManager.h"
 #include <app/util/basic-types.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/ErrorStr.h>
 #include <setup_payload/SetupPayload.h>
-#include <support/CHIPMem.h>
-#include <support/CodeUtils.h>
-#include <support/ErrorStr.h>
 
 using namespace ::chip;
 

diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp
@@ -37,7 +37,7 @@
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/mdns/Advertiser.h>
-#include <support/CodeUtils.h>
+#include <lib/support/CodeUtils.h>
 
 static const char * TAG = "app-devicecallbacks";
 

diff --git a/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
@@ -38,9 +38,9 @@
 
 #include "qrcodegen.h"
 
+#include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
-#include <support/CodeUtils.h>
 
 // TODO need sensible library tag when put in library
 extern const char * TAG;

diff --git a/examples/all-clusters-app/esp32/main/Rpc.cpp b/examples/all-clusters-app/esp32/main/Rpc.cpp
@@ -29,7 +29,7 @@
 #include "pw_log/log.h"
 #include "pw_rpc/server.h"
 #include "pw_sys_io/sys_io.h"
-#include <support/logging/CHIPLogging.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 #include "ScreenManager.h"
 #include "esp_event.h"

diff --git a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h
@@ -26,11 +26,11 @@
 
 #pragma once
 
-#include <core/CHIPCore.h>
-#include <core/CHIPError.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include <support/DLLUtil.h>
+#include <lib/support/DLLUtil.h>
 
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -56,11 +56,11 @@
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/shell/Engine.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/ErrorStr.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/ManualSetupPayloadGenerator.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
-#include <support/CHIPMem.h>
-#include <support/ErrorStr.h>
 
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/clusters/on-off-server/on-off-server.h>

diff --git a/examples/all-clusters-app/linux/main.cpp b/examples/all-clusters-app/linux/main.cpp
@@ -28,9 +28,9 @@
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/util.h>
-#include <core/CHIPError.h>
-#include <support/CHIPMem.h>
-#include <support/RandUtils.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/RandUtils.h>
 
 #include "AppMain.h"
 

diff --git a/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp b/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp
@@ -26,10 +26,10 @@
 
 #include "CHIPDeviceManager.h"
 #include <app/util/basic-types.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/ErrorStr.h>
 #include <setup_payload/SetupPayload.h>
-#include <support/CHIPMem.h>
-#include <support/CodeUtils.h>
-#include <support/ErrorStr.h>
 
 using namespace ::chip;
 

diff --git a/examples/bridge-app/esp32/main/Device.cpp b/examples/bridge-app/esp32/main/Device.cpp
@@ -18,8 +18,8 @@
 #include "Device.h"
 
 #include <cstdio>
+#include <lib/support/CHIPMemString.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <support/CHIPMemString.h>
 
 using namespace ::chip::Platform;
 

diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
@@ -22,7 +22,7 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
 #include <app/server/Mdns.h>
-#include <support/CodeUtils.h>
+#include <lib/support/CodeUtils.h>
 
 static const char * TAG = "bridge-devicecallbacks";
 

diff --git a/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h b/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h
@@ -24,11 +24,11 @@
  *      activities within the CHIP stack. This is a singleton object.
  */
 
-#include <core/CHIPCore.h>
-#include <core/CHIPError.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include <support/DLLUtil.h>
+#include <lib/support/DLLUtil.h>
 
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
@@ -25,11 +25,11 @@
 #include <app/reporting/reporting.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
-#include <core/CHIPError.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <support/CHIPMemString.h>
-#include <support/ErrorStr.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMemString.h>
+#include <lib/support/ErrorStr.h>
 
 #include <app/server/Server.h>
 

diff --git a/examples/bridge-app/linux/Options.cpp b/examples/bridge-app/linux/Options.cpp
@@ -18,8 +18,8 @@
 
 #include "Options.h"
 
-#include <core/CHIPError.h>
-#include <support/CHIPArgParser.hpp>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPArgParser.hpp>
 
 using namespace chip;
 using namespace chip::ArgParser;

diff --git a/examples/bridge-app/linux/include/Options.h b/examples/bridge-app/linux/include/Options.h
@@ -26,7 +26,7 @@
 
 #include <cstdint>
 
-#include <core/CHIPError.h>
+#include <lib/core/CHIPError.h>
 #include <setup_payload/SetupPayload.h>
 
 struct LinuxDeviceOptions

diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -29,14 +29,14 @@
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/util.h>
-#include <core/CHIPError.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/RandUtils.h>
 #include <lib/support/ZclString.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
-#include <support/CHIPMem.h>
-#include <support/RandUtils.h>
 
 #include "Device.h"
 #include "Options.h"

diff --git a/examples/chip-tool/commands/clusters/ModelCommand.h b/examples/chip-tool/commands/clusters/ModelCommand.h
@@ -22,7 +22,7 @@
 #include "../common/Command.h"
 #include <app/chip-zcl-zpro-codec.h>
 #include <controller/ExampleOperationalCredentialsIssuer.h>
-#include <core/CHIPEncoding.h>
+#include <lib/core/CHIPEncoding.h>
 
 // Limits on endpoint values.
 #define CHIP_ZCL_ENDPOINT_MIN 0x00

diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
@@ -25,12 +25,12 @@
 #include <sys/types.h>
 
 #include <lib/core/CHIPSafeCasts.h>
-#include <support/BytesToHex.h>
-#include <support/CHIPMem.h>
-#include <support/CodeUtils.h>
-#include <support/SafeInt.h>
-#include <support/ScopedBuffer.h>
-#include <support/logging/CHIPLogging.h>
+#include <lib/support/BytesToHex.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/SafeInt.h>
+#include <lib/support/ScopedBuffer.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 bool Command::InitArguments(int argc, char ** argv)
 {

diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
@@ -21,8 +21,8 @@
 #include "controller/ExampleOperationalCredentialsIssuer.h"
 #include <controller/CHIPDeviceController.h>
 #include <inet/InetInterface.h>
-#include <support/Span.h>
-#include <support/logging/CHIPLogging.h>
+#include <lib/support/Span.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 #include <atomic>
 #include <condition_variable>

diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp
@@ -27,9 +27,9 @@
 #include <platform/CHIPDeviceLayer.h>
 #endif
 
-#include <support/CHIPMem.h>
-#include <support/CodeUtils.h>
-#include <support/ScopedBuffer.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/ScopedBuffer.h>
 
 void Commands::Register(const char * clusterName, commands_list commandsList)
 {

diff --git a/examples/chip-tool/commands/discover/Commands.h b/examples/chip-tool/commands/discover/Commands.h
@@ -22,7 +22,7 @@
 #include "DiscoverCommissionablesCommand.h"
 #include "DiscoverCommissionersCommand.h"
 #include <controller/DeviceAddressUpdateDelegate.h>
-#include <mdns/Resolver.h>
+#include <lib/mdns/Resolver.h>
 
 constexpr uint16_t kMdnsPort = 5353;
 

diff --git a/examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.cpp b/examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "DiscoverCommissionablesCommand.h"
-#include <support/BytesToHex.h>
+#include <lib/support/BytesToHex.h>
 
 using namespace ::chip;
 

diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -21,8 +21,8 @@
 #include <controller/ExampleOperationalCredentialsIssuer.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/logging/CHIPLogging.h>
 #include <protocols/secure_channel/PASESession.h>
-#include <support/logging/CHIPLogging.h>
 
 #include <setup_payload/ManualSetupPayloadParser.h>
 #include <setup_payload/QRCodeSetupPayloadParser.h>

diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h
@@ -24,9 +24,9 @@
 #include <zap-generated/CHIPClusters.h>
 
 #include <controller/ExampleOperationalCredentialsIssuer.h>
+#include <lib/support/Span.h>
 #include <lib/support/ThreadOperationalDataset.h>
 #include <setup_payload/SetupPayload.h>
-#include <support/Span.h>
 
 enum class PairingMode
 {

diff --git a/examples/chip-tool/config/PersistentStorage.cpp b/examples/chip-tool/config/PersistentStorage.cpp
@@ -18,8 +18,8 @@
 #include "PersistentStorage.h"
 
 #include <lib/core/CHIPEncoding.h>
+#include <lib/support/Base64.h>
 #include <protocols/secure_channel/PASESession.h>
-#include <support/Base64.h>
 
 #include <fstream>
 #include <memory>

diff --git a/examples/chip-tool/config/PersistentStorage.h b/examples/chip-tool/config/PersistentStorage.h
@@ -21,7 +21,7 @@
 #include <app/util/basic-types.h>
 #include <controller/CHIPDeviceController.h>
 #include <inipp/inipp.h>
-#include <support/logging/CHIPLogging.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 class PersistentStorage : public chip::PersistentStorageDelegate
 {

diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt
@@ -5,10 +5,10 @@
 #include <cstdint>
 
 #include <commands/clusters/ModelCommand.h>
+#include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/BytesToHex.h>
 #include <zap-generated/CHIPClientCallbacks.h>
 #include <zap-generated/CHIPClusters.h>
-#include <lib/core/CHIPSafeCasts.h>
-#include <support/BytesToHex.h>
 
 static void OnDefaultSuccessResponse(void * context)
 {

diff --git a/examples/common/pigweed/RpcService.cpp b/examples/common/pigweed/RpcService.cpp
@@ -30,7 +30,7 @@
 #include "pw_stream/sys_io_stream.h"
 #include "pw_sys_io/sys_io.h"
 
-#include "support/logging/CHIPLogging.h"
+#include <lib/support/logging/CHIPLogging.h>
 
 #include <array>
 

diff --git a/examples/common/screen-framework/ScreenManager.cpp b/examples/common/screen-framework/ScreenManager.cpp
@@ -27,7 +27,7 @@
 
 #if CONFIG_HAVE_DISPLAY
 
-#include <support/CHIPMem.h>
+#include <lib/support/CHIPMem.h>
 
 #include <cassert>
 #include <vector>

diff --git a/examples/common/screen-framework/include/ListScreen.h b/examples/common/screen-framework/include/ListScreen.h
@@ -30,7 +30,7 @@
 
 #if CONFIG_HAVE_DISPLAY
 
-#include <support/CHIPMem.h>
+#include <lib/support/CHIPMem.h>
 
 #include <functional>
 #include <string>

diff --git a/examples/lighting-app/efr32/include/AppConfig.h b/examples/lighting-app/efr32/include/AppConfig.h
@@ -67,6 +67,6 @@ void appError(int err);
 #ifdef __cplusplus
 }
 
-#include <core/CHIPError.h>
+#include <lib/core/CHIPError.h>
 void appError(CHIP_ERROR error);
 #endif
diff --git a/examples/lighting-app/efr32/include/LightingManager.h b/examples/lighting-app/efr32/include/LightingManager.h
@@ -26,7 +26,7 @@
 #include "FreeRTOS.h"
 #include "timers.h" // provides FreeRTOS timer support
 
-#include <core/CHIPError.h>
+#include <lib/core/CHIPError.h>
 
 class LightingManager
 {

diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/efr32/src/ZclCallbacks.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "AppConfig.h"
-#include <support/logging/CHIPLogging.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 #include "LightingManager.h"
 

diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp
@@ -28,10 +28,10 @@
 #include <FreeRTOS.h>
 #include <mbedtls/threading.h>
 
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPPlatformMemory.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/KeyValueStoreManager.h>
-#include <support/CHIPMem.h>
-#include <support/CHIPPlatformMemory.h>
 
 #include <AppTask.h>