--common_code_reduction

Author: jepenven-silabs

slc/component/matter-clusters/matter_ota_requestor.slcc

@@ -20,15 +20,6 @@ source:
   - path: third_party/matter_sdk/src/app/clusters/ota-requestor/OTARequestorCluster.cpp
   - path: third_party/matter_sdk/src/app/clusters/ota-requestor/OTATestEventTriggerHandler.cpp
 include:
-  - path: third_party/matter_sdk/src/controller
-    file_list:
-      - path: CHIPCluster.h
-      - path: CommandSenderAllocator.h
-      - path: InvokeInteraction.h
-      - path: ReadInteraction.h
-      - path: TypedCommandCallback.h
-      - path: TypedReadCallback.h
-      - path: WriteInteraction.h
   - path: third_party/matter_sdk/src/app/clusters/ota-requestor
     file_list:
       - path: BDXDownloader.h
@@ -44,6 +35,19 @@ include:
       - path: OTARequestorStorage.h
       - path: OTARequestorUserConsentDelegate.h
       - path: OTATestEventTriggerHandler.h
+# TODO these dependencies need to be fixed on CSA
+  - path: third_party/matter_sdk/src/controller
+    file_list:
+      - path: CHIPCluster.h
+      - path: InvokeInteraction.h
+      - path: TypedCommandCallback.h
+      - path: ReadInteraction.h
+      - path: TypedReadCallback.h
+      - path: WriteInteraction.h
+      - path: CommandSenderAllocator.h
+  - path: third_party/matter_sdk/src/app
+    file_list:
+      - path: BufferedReadCallback.h
 template_contribution:
   - name: component_catalog
     value: matter_ota_requestor

slc/component/matter-core-sdk/interaction_model.slcc

@@ -17,6 +17,7 @@ include:
   - path: third_party/nlio/include
   - path: third_party/matter_sdk/src/app
     file_list:
+    -   path: ReadClient.h # Unless we refactor everything matter needs this header even if the content is not compiled.
     -   path: AttributeAccessToken.h
     -   path: InteractionModelDelegatePointers.h
     -   path: InteractionModelTimeout.h
@@ -53,12 +54,10 @@ include:
     -   path: InteractionModelHelper.h
     -   path: InteractionModelEngine.h
     -   path: EventLoggingTypes.h
-    -   path: ReadClient.h
     -   path: CommandResponseSender.h
     -   path: StatusResponse.h
     -   path: ReadPrepareParams.h
     -   path: WriteClient.h
-    -   path: BufferedReadCallback.h
     -   path: EventPathParams.h
     -   path: CommandResponseHelper.h
     -   path: CommandHandlerInterface.h
@@ -70,7 +69,6 @@ include:
     -   path: AttributeAccessInterface.h
     -   path: SafeAttributePersistenceProvider.h
     -   path: EventHeader.h
-    -   path: ClusterStateCache.h
     -   path: CASEClientPool.h
     -   path: SpecificationDefinedRevisions.h
     -   path: OperationalSessionSetupPool.h
@@ -100,7 +98,6 @@ source:
 -   path: third_party/matter_sdk/src/app/InteractionModelEngine.cpp
 -   path: third_party/matter_sdk/src/app/OperationalSessionSetup.cpp
 -   path: third_party/matter_sdk/src/app/PendingResponseTrackerImpl.cpp
--   path: third_party/matter_sdk/src/app/ReadClient.cpp
 -   path: third_party/matter_sdk/src/app/SimpleSubscriptionResumptionStorage.cpp
 -   path: third_party/matter_sdk/src/app/StatusResponse.cpp
 -   path: third_party/matter_sdk/src/app/SubscriptionResumptionSessionEstablisher.cpp

slc/component/matter-core-sdk/libchipdatamodel.slcc

@@ -65,12 +65,10 @@ include:
     -   path: InteractionModelHelper.h
     -   path: InteractionModelEngine.h
     -   path: EventLoggingTypes.h
-    -   path: ReadClient.h
     -   path: CommandResponseSender.h
     -   path: StatusResponse.h
     -   path: ReadPrepareParams.h
     -   path: WriteClient.h
-    -   path: BufferedReadCallback.h
     -   path: EventPathParams.h
     -   path: CommandResponseHelper.h
     -   path: CommandHandlerInterface.h
@@ -83,7 +81,6 @@ include:
     -   path: AttributeAccessInterface.h
     -   path: SafeAttributePersistenceProvider.h
     -   path: EventHeader.h
-    -   path: ClusterStateCache.h
     -   path: CASEClientPool.h
     -   path: SpecificationDefinedRevisions.h
     -   path: OperationalSessionSetupPool.h
@@ -115,9 +112,7 @@ source:
 -   path: third_party/matter_sdk/src/app/AttributeReportBuilder.cpp
 -   path: third_party/matter_sdk/src/app/AttributePathExpandIterator.cpp
 -   path: third_party/matter_sdk/src/app/AttributeValueEncoder.cpp
--   path: third_party/matter_sdk/src/app/BufferedReadCallback.cpp
 -   path: third_party/matter_sdk/src/app/ChunkedWriteCallback.cpp
--   path: third_party/matter_sdk/src/app/ClusterStateCache.cpp
 -   path: third_party/matter_sdk/src/app/CommandHandler.cpp
 -   path: third_party/matter_sdk/src/app/CommandHandlerImpl.cpp
 -   path: third_party/matter_sdk/src/app/CommandHandlerInterfaceRegistry.cpp

slc/component/matter-core-sdk/read_client.slcc

@@ -0,0 +1,25 @@
+category: Matter|Interaction Model
+
+description: Implements the Matter Interaction Model for the read client. Mostly use for controller.
+id: matter_read_client
+label: read_client
+package: matter
+provides:
+  - name: matter_read_client
+quality: production
+metadata:
+  sbom:
+    license: "Apache 2.0"
+
+    
+define:
+  - name: CHIP_CONFIG_ENABLE_READ_CLIENT
+    value: 1
+include:
+- path: third_party/matter_sdk/src/app/BufferedReadCallback.h
+- path: third_party/matter_sdk/src/app/ReadClient.h
+- path: third_party/matter_sdk/src/app/ClusterStateCache.h
+source:
+- path: third_party/matter_sdk/src/app/ReadClient.cpp
+- path: third_party/matter_sdk/src/app/BufferedReadCallback.cpp
+- path: third_party/matter_sdk/src/app/ClusterStateCache.cpp

slc/component/matter-platform/shell/matter_shell.slcc

@@ -105,6 +105,7 @@ source:
     condition: [matter_tracing]
   - path: third_party/matter_sdk/examples/platform/silabs/shell/ble/BLEShellCommands.cpp
   - path: third_party/matter_sdk/examples/platform/silabs/shell/im/IMShellCommands.cpp
+    condition: [matter_read_client]
 
 define:
   - name: ENABLE_CHIP_SHELL

slc/component/matter-platform/size-reduction/matter_no_debug.slcc

@@ -24,3 +24,6 @@ define:
     value: "OT_LOG_LEVEL_NONE"
   - name: OPENTHREAD_CONFIG_LOG_LEVEL
     value: "OPENTHREAD_CONFIG_LOG_OUTPUT_NONE"
+  - name: SL_MATTER_CLI_ARG_PARSER
+    value: 0
+    unless: [matter_shell]

slc/inc/app/AppBuildConfig.h

@@ -13,7 +13,7 @@
 
 // <i> Default: 1
 // <q CHIP_CONFIG_ENABLE_READ_CLIENT> Read Client
-#define CHIP_CONFIG_ENABLE_READ_CLIENT 1
+#define CHIP_CONFIG_ENABLE_READ_CLIENT 0
 
 // <i> Default: 1
 // <q CHIP_CONFIG_ENABLE_SESSION_RESUMPTION> Session Resumption