Move EventLoggingTypes.h and EventHeader.h to be seen by GN (#32416)

* Move EventHeader and EventLoggingTypes into MessageDef because that seems to be the pimary use * Fix compile and lints * Restyle
project-chip · Mar 4, 2024 · 5c59934 · 5c59934
1 parent 0b4caea
commit 5c59934
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 30 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -97,8 +97,6 @@ jobs:
                      --known-failure app/CommandHandlerInterface.h \
                      --known-failure app/CommandSenderLegacyCallback.h \
                      --known-failure app/data-model/ListLargeSystemExtensions.h \
-                     --known-failure app/EventHeader.h \
-                     --known-failure app/EventLoggingTypes.h \
                      --known-failure app/ReadHandler.h \
                      --known-failure app/ReadPrepareParams.h \
                      --known-failure app/reporting/tests/MockReportScheduler.cpp \

diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
@@ -86,7 +86,7 @@ static_library("chip-tool-utils") {
     "commands/storage/StorageManagementCommand.cpp",
   ]
 
-  deps = []
+  deps = [ "${chip_root}/src/app/MessageDef:events" ]
 
   if (config_use_interactive_mode) {
     sources += [ "commands/interactive/InteractiveCommands.cpp" ]

diff --git a/examples/chip-tool/commands/clusters/DataModelLogger.h b/examples/chip-tool/commands/clusters/DataModelLogger.h
@@ -23,7 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/EventHeader.h>
+#include <app/MessageDef/EventHeader.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/data-model/DecodableList.h>
 #include <commands/common/RemoteDataModelLogger.h>

diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.h b/examples/chip-tool/commands/common/RemoteDataModelLogger.h
@@ -20,7 +20,7 @@
 
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/EventHeader.h>
+#include <app/MessageDef/EventHeader.h>
 #include <app/MessageDef/StatusIB.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/dnssd/Resolver.h>

diff --git a/src/access/BUILD.gn b/src/access/BUILD.gn
@@ -14,16 +14,26 @@
 
 import("//build_overrides/chip.gni")
 
+source_set("types") {
+  sources = [
+    "AuthMode.h",
+    "Privilege.h",
+    "RequestPath.h",
+    "SubjectDescriptor.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/core:types",
+  ]
+}
+
 static_library("access") {
   output_name = "libaccess"
 
   sources = [
     "AccessControl.cpp",
     "AccessControl.h",
-    "AuthMode.h",
-    "Privilege.h",
-    "RequestPath.h",
-    "SubjectDescriptor.h",
     "examples/ExampleAccessControlDelegate.cpp",
     "examples/ExampleAccessControlDelegate.h",
     "examples/PermissiveAccessControlDelegate.cpp",
@@ -33,6 +43,7 @@ static_library("access") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
+    ":types",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:types",
     "${chip_root}/src/lib/support",

diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -192,6 +192,8 @@ static_library("interaction-model") {
     "reporting/reporting.h",
   ]
 
+  deps = [ "${chip_root}/src/app/MessageDef:events" ]
+
   public_deps = [
     ":app_config",
     ":constants",

diff --git a/src/app/EventManagement.h b/src/app/EventManagement.h
@@ -27,9 +27,9 @@
 #pragma once
 
 #include "EventLoggingDelegate.h"
-#include "EventLoggingTypes.h"
 #include <access/SubjectDescriptor.h>
 #include <app/MessageDef/EventDataIB.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/util/basic-types.h>
 #include <lib/core/TLVCircularBuffer.h>

diff --git a/src/app/MessageDef/BUILD.gn b/src/app/MessageDef/BUILD.gn
@@ -13,6 +13,18 @@
 # limitations under the License.
 import("//build_overrides/chip.gni")
 
+source_set("events") {
+  sources = [
+    "EventHeader.h",
+    "EventLoggingTypes.h",
+  ]
+
+  deps = [
+    "${chip_root}/src/access:types",
+    "${chip_root}/src/app:paths",
+  ]
+}
+
 source_set("MessageDef") {
   sources = [
     "ArrayBuilder.cpp",
@@ -112,6 +124,7 @@ source_set("MessageDef") {
   ]
 
   deps = [
+    ":events",
     "${chip_root}/src/app:app_config",
     "${chip_root}/src/app:constants",
     "${chip_root}/src/app:paths",

diff --git a/src/app/MessageDef/EventDataIB.h b/src/app/MessageDef/EventDataIB.h
@@ -27,8 +27,8 @@
 #include "StructBuilder.h"
 #include "StructParser.h"
 #include <app/AppConfig.h>
-#include <app/EventHeader.h>
-#include <app/EventLoggingTypes.h>
+#include <app/MessageDef/EventHeader.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>

diff --git a/src/app/EventHeader.h → src/app/MessageDef/EventHeader.h b/src/app/EventHeader.h → src/app/MessageDef/EventHeader.h
@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include "ConcreteEventPath.h"
 #include "EventLoggingTypes.h"
+
+#include <app/ConcreteEventPath.h>
 #include <app/util/basic-types.h>
 
 namespace chip {

diff --git a/src/app/EventLoggingTypes.h → src/app/MessageDef/EventLoggingTypes.h b/src/app/EventLoggingTypes.h → src/app/MessageDef/EventLoggingTypes.h
diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
@@ -27,8 +27,8 @@
 #include <app/AppConfig.h>
 #include <app/AttributePathParams.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/EventHeader.h>
 #include <app/EventPathParams.h>
+#include <app/MessageDef/EventHeader.h>
 #include <app/MessageDef/ReadRequestMessage.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/MessageDef/StatusResponseMessage.h>

diff --git a/src/app/common/BUILD.gn b/src/app/common/BUILD.gn
@@ -48,6 +48,7 @@ static_library("cluster-objects") {
   public_deps = [
     ":ids",
     "${chip_root}/src/app:paths",
+    "${chip_root}/src/app/MessageDef:events",
     "${chip_root}/src/app/data-model",
     "${chip_root}/src/app/util:types",
     "${chip_root}/src/lib/core",

diff --git a/src/app/tests/TestEventLogging.cpp b/src/app/tests/TestEventLogging.cpp
@@ -24,9 +24,9 @@
 
 #include <access/SubjectDescriptor.h>
 #include <app/EventLoggingDelegate.h>
-#include <app/EventLoggingTypes.h>
 #include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/tests/AppTestContext.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>

diff --git a/src/app/tests/TestEventLoggingNoUTCTime.cpp b/src/app/tests/TestEventLoggingNoUTCTime.cpp
@@ -23,9 +23,9 @@
 
 #include <access/SubjectDescriptor.h>
 #include <app/EventLoggingDelegate.h>
-#include <app/EventLoggingTypes.h>
 #include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/tests/AppTestContext.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>

diff --git a/src/app/tests/TestEventOverflow.cpp b/src/app/tests/TestEventOverflow.cpp
@@ -23,9 +23,9 @@
  */
 
 #include <app/EventLoggingDelegate.h>
-#include <app/EventLoggingTypes.h>
 #include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/tests/AppTestContext.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>

diff --git a/src/app/tests/TestFabricScopedEventLogging.cpp b/src/app/tests/TestFabricScopedEventLogging.cpp
@@ -24,9 +24,9 @@
 
 #include <access/SubjectDescriptor.h>
 #include <app/EventLoggingDelegate.h>
-#include <app/EventLoggingTypes.h>
 #include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/tests/AppTestContext.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/ErrorStr.h>

diff --git a/src/app/tests/integration/MockEvents.cpp b/src/app/tests/integration/MockEvents.cpp
@@ -25,8 +25,8 @@
 
 #include "MockEvents.h"
 #include "common.h"
-#include <app/EventLoggingTypes.h>
 #include <app/EventManagement.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <lib/core/ErrorStr.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <protocols/secure_channel/PASESession.h>

diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -8,7 +8,7 @@
 #include <app/data-model/List.h>
 #include <app/data-model/NullObject.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/EventLoggingTypes.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <app/util/basic-types.h>
 #include <lib/core/ClusterEnums.h>
 #include <lib/support/BitMask.h>

diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -21,7 +21,7 @@
 #include <controller/java/CHIPAttributeTLVValueDecoder.h>
 #include <controller/java/CHIPEventTLVValueDecoder.h>
 #endif
-#include <app/EventLoggingTypes.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <jni.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/support/CHIPJNIError.h>

diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice_Internal.h b/src/darwin/Framework/CHIP/MTRBaseDevice_Internal.h
@@ -23,9 +23,9 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/ConcreteEventPath.h>
 #include <app/DeviceProxy.h>
-#include <app/EventHeader.h>
-#include <app/EventLoggingTypes.h>
 #include <app/EventPathParams.h>
+#include <app/MessageDef/EventHeader.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <lib/core/CHIPVendorIdentifiers.hpp>
 #include <lib/core/TLVTags.h>
 #include <system/SystemPacketBuffer.h>

diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h
@@ -22,7 +22,7 @@
 #include <app/BufferedReadCallback.h>
 #include <app/ClusterStateCache.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/EventHeader.h>
+#include <app/MessageDef/EventHeader.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/ReadClient.h>
 #include <app/ReadPrepareParams.h>

diff --git a/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h b/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h
@@ -21,7 +21,7 @@
 #import <Foundation/Foundation.h>
 
 #include <app/ConcreteAttributePath.h>
-#include <app/EventLoggingTypes.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/TLV.h>
 

diff --git a/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt
@@ -12,8 +12,8 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Events.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/EventHeader.h>
-#include <app/EventLoggingTypes.h>
+#include <app/MessageDef/EventHeader.h>
+#include <app/MessageDef/EventLoggingTypes.h>
 #include <lib/support/TypeTraits.h>
 
 using namespace chip;

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h