[NXP] Fix otbr build issue

Signed-off-by: Martin Girardot <[email protected]>

third_party/openthread/platforms/nxp/rt/rw61x/BUILD.gn

@@ -58,11 +58,15 @@ config("openthread_rw61x_config") {
       "OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE=1",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_AUTO_ENABLE_ON_INFRA_IF=0",
       "OPENTHREAD_CONFIG_MULTICAST_DNS_PUBLIC_API_ENABLE=1",
-      "OPENTHREAD_CONFIG_BORDER_AGENT_EPHEMERAL_KEY_ENABLE=1",
       "OT_APP_BR_LWIP_HOOKS_EN=1",
-      "OT_APP_CLI_EPHEMERAL_KEY_ADDON=1",
-      "OT_APP_CLI_LWIP_ADDON=1",
     ]
+
+    if (chip_enable_matter_cli) {
+      defines += [
+        "OPENTHREAD_CONFIG_BORDER_AGENT_EPHEMERAL_KEY_ENABLE=1",
+        "OT_APP_CLI_EPHEMERAL_KEY_ADDON=1",
+        "OT_APP_CLI_LWIP_ADDON=1"
+      ]
   }
 
   # ot cli configs
@@ -86,9 +90,6 @@ source_set("libopenthread-rw61x") {
 
   if (chip_enable_wifi && chip_enable_openthread) {
     sources += [
-      "${openthread_nxp_root}/examples/utils/cli_addons/addons_cli.c",
-      "${openthread_nxp_root}/examples/utils/cli_addons/ephemeral_key/ephemeral_key_cli.c",
-      "${openthread_nxp_root}/examples/utils/cli_addons/lwip/lwip_cli.c",
       "${openthread_nxp_root}/src/common/br/border_agent.c",
       "${openthread_nxp_root}/src/common/br/br_rtos_manager.c",
       "${openthread_nxp_root}/src/common/br/infra_if.c",
@@ -98,6 +99,15 @@ source_set("libopenthread-rw61x") {
       "${openthread_nxp_root}/src/common/br/udp_plat.c",
       "${openthread_nxp_root}/src/common/br/utils.c",
     ]
+
+    if (chip_enable_matter_cli) {
+      sources += [
+        "${openthread_nxp_root}/examples/utils/cli_addons/addons_cli.c",
+        "${openthread_nxp_root}/examples/utils/cli_addons/ephemeral_key/ephemeral_key_cli.c",
+        "${openthread_nxp_root}/examples/utils/cli_addons/lwip/lwip_cli.c",
+      ]
+    }
+
     deps += [ "${nxp_sdk_build_root}:nxp_lwip" ]
   }
   if (spinel_interface_rpmsg) {