Skip to content

Commit 53dd583

Browse files
kghostkghost
authored
Force include lib/ files with full path (project-chip#9387)
* Force include lib/ files with full path This is auto generated by using following commands: for i in support core asn1 mdns shell; do git sed "#include \"$i/\\(.*\\)\"\$" "#include <lib/$i/\\1>" ; done for i in support core asn1 mdns shell; do git sed "#include <$i/\\(.*\\)>\$" "#include <lib/$i/\\1>" ; done Note: git-sed is in the git-extras package * Restyle * Manual fixes
1 parent 0764c29 commit 53dd583

File tree

876 files changed

+2064
-2093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

876 files changed

+2064
-2093
lines changed

‎examples/all-clusters-app/esp32/main/Button.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "esp_system.h"
3030

3131
#include "Button.h"
32+
#include <lib/support/CodeUtils.h>
3233
#include <platform/CHIPDeviceLayer.h>
33-
#include <support/CodeUtils.h>
3434

3535
extern const char * TAG;
3636

‎examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
#include "CHIPDeviceManager.h"
2828
#include <app/util/basic-types.h>
29+
#include <lib/support/CHIPMem.h>
30+
#include <lib/support/CodeUtils.h>
31+
#include <lib/support/ErrorStr.h>
2932
#include <setup_payload/SetupPayload.h>
30-
#include <support/CHIPMem.h>
31-
#include <support/CodeUtils.h>
32-
#include <support/ErrorStr.h>
3333

3434
using namespace ::chip;
3535

‎examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <app/util/basic-types.h>
3838
#include <app/util/util.h>
3939
#include <lib/mdns/Advertiser.h>
40-
#include <support/CodeUtils.h>
40+
#include <lib/support/CodeUtils.h>
4141

4242
static const char * TAG = "app-devicecallbacks";
4343

‎examples/all-clusters-app/esp32/main/QRCodeScreen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838

3939
#include "qrcodegen.h"
4040

41+
#include <lib/support/CodeUtils.h>
4142
#include <platform/CHIPDeviceLayer.h>
4243
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
43-
#include <support/CodeUtils.h>
4444

4545
// TODO need sensible library tag when put in library
4646
extern const char * TAG;

‎examples/all-clusters-app/esp32/main/Rpc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "pw_log/log.h"
3030
#include "pw_rpc/server.h"
3131
#include "pw_sys_io/sys_io.h"
32-
#include <support/logging/CHIPLogging.h>
32+
#include <lib/support/logging/CHIPLogging.h>
3333

3434
#include "ScreenManager.h"
3535
#include "esp_event.h"

‎examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
#pragma once
2828

29-
#include <core/CHIPCore.h>
30-
#include <core/CHIPError.h>
29+
#include <lib/core/CHIPCore.h>
30+
#include <lib/core/CHIPError.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

33-
#include <support/DLLUtil.h>
33+
#include <lib/support/DLLUtil.h>
3434

3535
#include <stdarg.h>
3636
#include <stdlib.h>

‎examples/all-clusters-app/esp32/main/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
#include <credentials/DeviceAttestationCredsProvider.h>
5757
#include <credentials/examples/DeviceAttestationCredsExample.h>
5858
#include <lib/shell/Engine.h>
59+
#include <lib/support/CHIPMem.h>
60+
#include <lib/support/ErrorStr.h>
5961
#include <platform/CHIPDeviceLayer.h>
6062
#include <setup_payload/ManualSetupPayloadGenerator.h>
6163
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
62-
#include <support/CHIPMem.h>
63-
#include <support/ErrorStr.h>
6464

6565
#include <app/clusters/door-lock-server/door-lock-server.h>
6666
#include <app/clusters/on-off-server/on-off-server.h>

‎examples/all-clusters-app/linux/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <app/util/af.h>
2929
#include <app/util/attribute-storage.h>
3030
#include <app/util/util.h>
31-
#include <core/CHIPError.h>
32-
#include <support/CHIPMem.h>
33-
#include <support/RandUtils.h>
31+
#include <lib/core/CHIPError.h>
32+
#include <lib/support/CHIPMem.h>
33+
#include <lib/support/RandUtils.h>
3434

3535
#include "AppMain.h"
3636

‎examples/bridge-app/esp32/main/CHIPDeviceManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
#include "CHIPDeviceManager.h"
2828
#include <app/util/basic-types.h>
29+
#include <lib/support/CHIPMem.h>
30+
#include <lib/support/CodeUtils.h>
31+
#include <lib/support/ErrorStr.h>
2932
#include <setup_payload/SetupPayload.h>
30-
#include <support/CHIPMem.h>
31-
#include <support/CodeUtils.h>
32-
#include <support/ErrorStr.h>
3333

3434
using namespace ::chip;
3535

‎examples/bridge-app/esp32/main/Device.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "Device.h"
1919

2020
#include <cstdio>
21+
#include <lib/support/CHIPMemString.h>
2122
#include <platform/CHIPDeviceLayer.h>
22-
#include <support/CHIPMemString.h>
2323

2424
using namespace ::chip::Platform;
2525

‎examples/bridge-app/esp32/main/DeviceCallbacks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <app-common/zap-generated/attribute-id.h>
2323
#include <app-common/zap-generated/cluster-id.h>
2424
#include <app/server/Mdns.h>
25-
#include <support/CodeUtils.h>
25+
#include <lib/support/CodeUtils.h>
2626

2727
static const char * TAG = "bridge-devicecallbacks";
2828

‎examples/bridge-app/esp32/main/include/CHIPDeviceManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
* activities within the CHIP stack. This is a singleton object.
2525
*/
2626

27-
#include <core/CHIPCore.h>
28-
#include <core/CHIPError.h>
27+
#include <lib/core/CHIPCore.h>
28+
#include <lib/core/CHIPError.h>
2929
#include <platform/CHIPDeviceLayer.h>
3030

31-
#include <support/DLLUtil.h>
31+
#include <lib/support/DLLUtil.h>
3232

3333
#include <stdarg.h>
3434
#include <stdlib.h>

‎examples/bridge-app/esp32/main/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
#include <app/reporting/reporting.h>
2626
#include <app/server/Server.h>
2727
#include <app/util/attribute-storage.h>
28-
#include <core/CHIPError.h>
2928
#include <credentials/DeviceAttestationCredsProvider.h>
3029
#include <credentials/examples/DeviceAttestationCredsExample.h>
31-
#include <support/CHIPMemString.h>
32-
#include <support/ErrorStr.h>
30+
#include <lib/core/CHIPError.h>
31+
#include <lib/support/CHIPMemString.h>
32+
#include <lib/support/ErrorStr.h>
3333

3434
#include <app/server/Server.h>
3535

‎examples/bridge-app/linux/Options.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "Options.h"
2020

21-
#include <core/CHIPError.h>
22-
#include <support/CHIPArgParser.hpp>
21+
#include <lib/core/CHIPError.h>
22+
#include <lib/support/CHIPArgParser.hpp>
2323

2424
using namespace chip;
2525
using namespace chip::ArgParser;

‎examples/bridge-app/linux/include/Options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <cstdint>
2828

29-
#include <core/CHIPError.h>
29+
#include <lib/core/CHIPError.h>
3030
#include <setup_payload/SetupPayload.h>
3131

3232
struct LinuxDeviceOptions

‎examples/bridge-app/linux/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
#include <app/util/af.h>
3030
#include <app/util/attribute-storage.h>
3131
#include <app/util/util.h>
32-
#include <core/CHIPError.h>
3332
#include <credentials/DeviceAttestationCredsProvider.h>
3433
#include <credentials/examples/DeviceAttestationCredsExample.h>
34+
#include <lib/core/CHIPError.h>
35+
#include <lib/support/CHIPMem.h>
36+
#include <lib/support/RandUtils.h>
3537
#include <lib/support/ZclString.h>
3638
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
3739
#include <setup_payload/SetupPayload.h>
38-
#include <support/CHIPMem.h>
39-
#include <support/RandUtils.h>
4040

4141
#include "Device.h"
4242
#include "Options.h"

‎examples/chip-tool/commands/clusters/ModelCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "../common/Command.h"
2323
#include <app/chip-zcl-zpro-codec.h>
2424
#include <controller/ExampleOperationalCredentialsIssuer.h>
25-
#include <core/CHIPEncoding.h>
25+
#include <lib/core/CHIPEncoding.h>
2626

2727
// Limits on endpoint values.
2828
#define CHIP_ZCL_ENDPOINT_MIN 0x00

‎examples/chip-tool/commands/common/Command.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#include <sys/types.h>
2626

2727
#include <lib/core/CHIPSafeCasts.h>
28-
#include <support/BytesToHex.h>
29-
#include <support/CHIPMem.h>
30-
#include <support/CodeUtils.h>
31-
#include <support/SafeInt.h>
32-
#include <support/ScopedBuffer.h>
33-
#include <support/logging/CHIPLogging.h>
28+
#include <lib/support/BytesToHex.h>
29+
#include <lib/support/CHIPMem.h>
30+
#include <lib/support/CodeUtils.h>
31+
#include <lib/support/SafeInt.h>
32+
#include <lib/support/ScopedBuffer.h>
33+
#include <lib/support/logging/CHIPLogging.h>
3434

3535
bool Command::InitArguments(int argc, char ** argv)
3636
{

‎examples/chip-tool/commands/common/Command.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "controller/ExampleOperationalCredentialsIssuer.h"
2222
#include <controller/CHIPDeviceController.h>
2323
#include <inet/InetInterface.h>
24-
#include <support/Span.h>
25-
#include <support/logging/CHIPLogging.h>
24+
#include <lib/support/Span.h>
25+
#include <lib/support/logging/CHIPLogging.h>
2626

2727
#include <atomic>
2828
#include <condition_variable>

‎examples/chip-tool/commands/common/Commands.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include <platform/CHIPDeviceLayer.h>
2828
#endif
2929

30-
#include <support/CHIPMem.h>
31-
#include <support/CodeUtils.h>
32-
#include <support/ScopedBuffer.h>
30+
#include <lib/support/CHIPMem.h>
31+
#include <lib/support/CodeUtils.h>
32+
#include <lib/support/ScopedBuffer.h>
3333

3434
void Commands::Register(const char * clusterName, commands_list commandsList)
3535
{

‎examples/chip-tool/commands/discover/Commands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "DiscoverCommissionablesCommand.h"
2323
#include "DiscoverCommissionersCommand.h"
2424
#include <controller/DeviceAddressUpdateDelegate.h>
25-
#include <mdns/Resolver.h>
25+
#include <lib/mdns/Resolver.h>
2626

2727
constexpr uint16_t kMdnsPort = 5353;
2828

‎examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#include "DiscoverCommissionablesCommand.h"
20-
#include <support/BytesToHex.h>
20+
#include <lib/support/BytesToHex.h>
2121

2222
using namespace ::chip;
2323

‎examples/chip-tool/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <controller/ExampleOperationalCredentialsIssuer.h>
2222
#include <crypto/CHIPCryptoPAL.h>
2323
#include <lib/core/CHIPSafeCasts.h>
24+
#include <lib/support/logging/CHIPLogging.h>
2425
#include <protocols/secure_channel/PASESession.h>
25-
#include <support/logging/CHIPLogging.h>
2626

2727
#include <setup_payload/ManualSetupPayloadParser.h>
2828
#include <setup_payload/QRCodeSetupPayloadParser.h>

‎examples/chip-tool/commands/pairing/PairingCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include <zap-generated/CHIPClusters.h>
2525

2626
#include <controller/ExampleOperationalCredentialsIssuer.h>
27+
#include <lib/support/Span.h>
2728
#include <lib/support/ThreadOperationalDataset.h>
2829
#include <setup_payload/SetupPayload.h>
29-
#include <support/Span.h>
3030

3131
enum class PairingMode
3232
{

‎examples/chip-tool/config/PersistentStorage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "PersistentStorage.h"
1919

2020
#include <lib/core/CHIPEncoding.h>
21+
#include <lib/support/Base64.h>
2122
#include <protocols/secure_channel/PASESession.h>
22-
#include <support/Base64.h>
2323

2424
#include <fstream>
2525
#include <memory>

‎examples/chip-tool/config/PersistentStorage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <app/util/basic-types.h>
2222
#include <controller/CHIPDeviceController.h>
2323
#include <inipp/inipp.h>
24-
#include <support/logging/CHIPLogging.h>
24+
#include <lib/support/logging/CHIPLogging.h>
2525

2626
class PersistentStorage : public chip::PersistentStorageDelegate
2727
{

‎examples/chip-tool/templates/commands.zapt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#include <cstdint>
66

77
#include <commands/clusters/ModelCommand.h>
8+
#include <lib/core/CHIPSafeCasts.h>
9+
#include <lib/support/BytesToHex.h>
810
#include <zap-generated/CHIPClientCallbacks.h>
911
#include <zap-generated/CHIPClusters.h>
10-
#include <lib/core/CHIPSafeCasts.h>
11-
#include <support/BytesToHex.h>
1212

1313
static void OnDefaultSuccessResponse(void * context)
1414
{

‎examples/common/pigweed/RpcService.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "pw_stream/sys_io_stream.h"
3131
#include "pw_sys_io/sys_io.h"
3232

33-
#include "support/logging/CHIPLogging.h"
33+
#include <lib/support/logging/CHIPLogging.h>
3434

3535
#include <array>
3636

‎examples/common/screen-framework/ScreenManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#if CONFIG_HAVE_DISPLAY
2929

30-
#include <support/CHIPMem.h>
30+
#include <lib/support/CHIPMem.h>
3131

3232
#include <cassert>
3333
#include <vector>

‎examples/common/screen-framework/include/ListScreen.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#if CONFIG_HAVE_DISPLAY
3232

33-
#include <support/CHIPMem.h>
33+
#include <lib/support/CHIPMem.h>
3434

3535
#include <functional>
3636
#include <string>

‎examples/lighting-app/efr32/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ void appError(int err);
6767
#ifdef __cplusplus
6868
}
6969

70-
#include <core/CHIPError.h>
70+
#include <lib/core/CHIPError.h>
7171
void appError(CHIP_ERROR error);
7272
#endif

‎examples/lighting-app/efr32/include/LightingManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "FreeRTOS.h"
2727
#include "timers.h" // provides FreeRTOS timer support
2828

29-
#include <core/CHIPError.h>
29+
#include <lib/core/CHIPError.h>
3030

3131
class LightingManager
3232
{

‎examples/lighting-app/efr32/src/ZclCallbacks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
#include "AppConfig.h"
24-
#include <support/logging/CHIPLogging.h>
24+
#include <lib/support/logging/CHIPLogging.h>
2525

2626
#include "LightingManager.h"
2727

‎examples/lighting-app/efr32/src/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#include <FreeRTOS.h>
2929
#include <mbedtls/threading.h>
3030

31+
#include <lib/support/CHIPMem.h>
32+
#include <lib/support/CHIPPlatformMemory.h>
3133
#include <platform/CHIPDeviceLayer.h>
3234
#include <platform/KeyValueStoreManager.h>
33-
#include <support/CHIPMem.h>
34-
#include <support/CHIPPlatformMemory.h>
3535

3636
#include <AppTask.h>
3737

0 commit comments

Comments
 (0)