Skip to content

Commit d8aaa1c

Browse files
andy31415andy31415
authored
Move MessageDef:events back to app:events (project-chip#32442)
* move files back into app * Update paths * restyle * Update GN build files * restyle * Update missed file from last time
1 parent b93fb48 commit d8aaa1c

24 files changed

+38
-38
lines changed

‎examples/chip-tool/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static_library("chip-tool-utils") {
8686
"commands/storage/StorageManagementCommand.cpp",
8787
]
8888

89-
deps = [ "${chip_root}/src/app/MessageDef:events" ]
89+
deps = [ "${chip_root}/src/app:events" ]
9090

9191
if (config_use_interactive_mode) {
9292
sources += [ "commands/interactive/InteractiveCommands.cpp" ]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <app-common/zap-generated/cluster-objects.h>
2424
#include <app/ConcreteAttributePath.h>
2525
#include <app/ConcreteCommandPath.h>
26-
#include <app/MessageDef/EventHeader.h>
26+
#include <app/EventHeader.h>
2727
#include <app/MessageDef/StatusIB.h>
2828
#include <app/data-model/DecodableList.h>
2929
#include <commands/common/RemoteDataModelLogger.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <app/ConcreteAttributePath.h>
2222
#include <app/ConcreteCommandPath.h>
23-
#include <app/MessageDef/EventHeader.h>
23+
#include <app/EventHeader.h>
2424
#include <app/MessageDef/StatusIB.h>
2525
#include <crypto/CHIPCryptoPAL.h>
2626
#include <lib/dnssd/Resolver.h>

‎src/app/BUILD.gn

+13-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static_library("interaction-model") {
192192
"reporting/reporting.h",
193193
]
194194

195-
deps = [ "${chip_root}/src/app/MessageDef:events" ]
195+
deps = [ "${chip_root}/src/app:events" ]
196196

197197
public_deps = [
198198
":app_config",
@@ -244,6 +244,18 @@ static_library("interaction-model") {
244244
}
245245
}
246246

247+
source_set("events") {
248+
sources = [
249+
"EventHeader.h",
250+
"EventLoggingTypes.h",
251+
]
252+
253+
deps = [
254+
":paths",
255+
"${chip_root}/src/access:types",
256+
]
257+
}
258+
247259
# Note to developpers, instead of continuously adding files in the app librabry, it is recommand to create smaller source_sets that app can depend on.
248260
# This way, we can have a better understanding of dependencies and other componenets can depend on the different source_sets without needing to depend on the entire app library.
249261
static_library("app") {

‎src/app/MessageDef/EventHeader.h ‎src/app/EventHeader.h

File renamed without changes.

‎src/app/MessageDef/EventLoggingTypes.h ‎src/app/EventLoggingTypes.h

File renamed without changes.

‎src/app/EventManagement.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include "EventLoggingDelegate.h"
3030
#include <access/SubjectDescriptor.h>
31+
#include <app/EventLoggingTypes.h>
3132
#include <app/MessageDef/EventDataIB.h>
32-
#include <app/MessageDef/EventLoggingTypes.h>
3333
#include <app/MessageDef/StatusIB.h>
3434
#include <app/util/basic-types.h>
3535
#include <lib/core/TLVCircularBuffer.h>

‎src/app/MessageDef/BUILD.gn

+1-13
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
1515

16-
source_set("events") {
17-
sources = [
18-
"EventHeader.h",
19-
"EventLoggingTypes.h",
20-
]
21-
22-
deps = [
23-
"${chip_root}/src/access:types",
24-
"${chip_root}/src/app:paths",
25-
]
26-
}
27-
2816
source_set("MessageDef") {
2917
sources = [
3018
"ArrayBuilder.cpp",
@@ -124,9 +112,9 @@ source_set("MessageDef") {
124112
]
125113

126114
deps = [
127-
":events",
128115
"${chip_root}/src/app:app_config",
129116
"${chip_root}/src/app:constants",
117+
"${chip_root}/src/app:events",
130118
"${chip_root}/src/app:paths",
131119
"${chip_root}/src/lib/core",
132120
"${chip_root}/src/lib/support",

‎src/app/MessageDef/EventDataIB.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "StructBuilder.h"
2828
#include "StructParser.h"
2929
#include <app/AppConfig.h>
30-
#include <app/MessageDef/EventHeader.h>
31-
#include <app/MessageDef/EventLoggingTypes.h>
30+
#include <app/EventHeader.h>
31+
#include <app/EventLoggingTypes.h>
3232
#include <app/util/basic-types.h>
3333
#include <lib/core/CHIPCore.h>
3434
#include <lib/core/TLV.h>

‎src/app/ReadClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include <app/AppConfig.h>
2828
#include <app/AttributePathParams.h>
2929
#include <app/ConcreteAttributePath.h>
30+
#include <app/EventHeader.h>
3031
#include <app/EventPathParams.h>
31-
#include <app/MessageDef/EventHeader.h>
3232
#include <app/MessageDef/ReadRequestMessage.h>
3333
#include <app/MessageDef/StatusIB.h>
3434
#include <app/MessageDef/StatusResponseMessage.h>

‎src/app/common/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ static_library("cluster-objects") {
4747

4848
public_deps = [
4949
":ids",
50+
"${chip_root}/src/app:events",
5051
"${chip_root}/src/app:paths",
51-
"${chip_root}/src/app/MessageDef:events",
5252
"${chip_root}/src/app/data-model",
5353
"${chip_root}/src/app/util:types",
5454
"${chip_root}/src/lib/core",

‎src/app/tests/TestEventLogging.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
#include <access/SubjectDescriptor.h>
2626
#include <app/EventLoggingDelegate.h>
27+
#include <app/EventLoggingTypes.h>
2728
#include <app/EventManagement.h>
2829
#include <app/InteractionModelEngine.h>
29-
#include <app/MessageDef/EventLoggingTypes.h>
3030
#include <app/tests/AppTestContext.h>
3131
#include <lib/core/CHIPCore.h>
3232
#include <lib/core/ErrorStr.h>

‎src/app/tests/TestEventLoggingNoUTCTime.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
#include <access/SubjectDescriptor.h>
2525
#include <app/EventLoggingDelegate.h>
26+
#include <app/EventLoggingTypes.h>
2627
#include <app/EventManagement.h>
2728
#include <app/InteractionModelEngine.h>
28-
#include <app/MessageDef/EventLoggingTypes.h>
2929
#include <app/tests/AppTestContext.h>
3030
#include <lib/core/CHIPCore.h>
3131
#include <lib/core/ErrorStr.h>

‎src/app/tests/TestEventOverflow.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424

2525
#include <app/EventLoggingDelegate.h>
26+
#include <app/EventLoggingTypes.h>
2627
#include <app/EventManagement.h>
2728
#include <app/InteractionModelEngine.h>
28-
#include <app/MessageDef/EventLoggingTypes.h>
2929
#include <app/tests/AppTestContext.h>
3030
#include <lib/core/CHIPCore.h>
3131
#include <lib/core/ErrorStr.h>

‎src/app/tests/TestFabricScopedEventLogging.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
#include <access/SubjectDescriptor.h>
2626
#include <app/EventLoggingDelegate.h>
27+
#include <app/EventLoggingTypes.h>
2728
#include <app/EventManagement.h>
2829
#include <app/InteractionModelEngine.h>
29-
#include <app/MessageDef/EventLoggingTypes.h>
3030
#include <app/tests/AppTestContext.h>
3131
#include <lib/core/CHIPCore.h>
3232
#include <lib/core/ErrorStr.h>

‎src/app/tests/integration/MockEvents.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
#include "MockEvents.h"
2727
#include "common.h"
28+
#include <app/EventLoggingTypes.h>
2829
#include <app/EventManagement.h>
29-
#include <app/MessageDef/EventLoggingTypes.h>
3030
#include <lib/core/ErrorStr.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232
#include <protocols/secure_channel/PASESession.h>

‎src/app/zap-templates/templates/app/cluster-objects.zapt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <app/data-model/List.h>
99
#include <app/data-model/NullObject.h>
1010
#include <app/ConcreteAttributePath.h>
11-
#include <app/MessageDef/EventLoggingTypes.h>
11+
#include <app/EventLoggingTypes.h>
1212
#include <app/util/basic-types.h>
1313
#include <lib/core/ClusterEnums.h>
1414
#include <lib/support/BitMask.h>

‎src/controller/java/AndroidCallbacks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <controller/java/CHIPAttributeTLVValueDecoder.h>
2222
#include <controller/java/CHIPEventTLVValueDecoder.h>
2323
#endif
24-
#include <app/MessageDef/EventLoggingTypes.h>
24+
#include <app/EventLoggingTypes.h>
2525
#include <jni.h>
2626
#include <lib/core/ErrorStr.h>
2727
#include <lib/support/CHIPJNIError.h>

‎src/darwin/Framework/CHIP/MTRBaseDevice_Internal.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <app/ConcreteCommandPath.h>
2424
#include <app/ConcreteEventPath.h>
2525
#include <app/DeviceProxy.h>
26+
#include <app/EventHeader.h>
27+
#include <app/EventLoggingTypes.h>
2628
#include <app/EventPathParams.h>
27-
#include <app/MessageDef/EventHeader.h>
28-
#include <app/MessageDef/EventLoggingTypes.h>
2929
#include <lib/core/CHIPVendorIdentifiers.hpp>
3030
#include <lib/core/TLVTags.h>
3131
#include <system/SystemPacketBuffer.h>

‎src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <app/BufferedReadCallback.h>
2323
#include <app/ClusterStateCache.h>
2424
#include <app/ConcreteAttributePath.h>
25-
#include <app/MessageDef/EventHeader.h>
25+
#include <app/EventHeader.h>
2626
#include <app/MessageDef/StatusIB.h>
2727
#include <app/ReadClient.h>
2828
#include <app/ReadPrepareParams.h>

‎src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#import <Foundation/Foundation.h>
2222

2323
#include <app/ConcreteAttributePath.h>
24-
#include <app/MessageDef/EventLoggingTypes.h>
24+
#include <app/EventLoggingTypes.h>
2525
#include <lib/core/CHIPError.h>
2626
#include <lib/core/TLV.h>
2727

‎src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <app-common/zap-generated/ids/Attributes.h>
1313
#include <app-common/zap-generated/ids/Events.h>
1414
#include <app-common/zap-generated/ids/Clusters.h>
15-
#include <app/MessageDef/EventHeader.h>
16-
#include <app/MessageDef/EventLoggingTypes.h>
15+
#include <app/EventHeader.h>
16+
#include <app/EventLoggingTypes.h>
1717
#include <lib/support/TypeTraits.h>
1818

1919
using namespace chip;

‎src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-objects.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)