From 5cd77a462a8f12bc5641900e0d96829f76f24080 Mon Sep 17 00:00:00 2001
From: pankore <86098180+pankore@users.noreply.github.com>
Date: Mon, 14 Feb 2022 17:25:08 +0800
Subject: [PATCH 1/2] Fix compile errors in RPC Change position of
 CONFIG_ENABLE_ROTATING_DEVICE_ID macro

---
 examples/all-clusters-app/ameba/chip_main.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
index e201e96ada55d7..ce5fafb3795405 100755
--- a/examples/all-clusters-app/ameba/chip_main.cmake
+++ b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -86,15 +86,15 @@ pw_proto_library(locking_service
 
 pw_proto_library(wifi_service
   SOURCES
-    ${chip_dir}/examples/ipv6only-app/common/wifi_service/wifi_service.proto
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.proto
   INPUTS
-    ${chip_dir}/examples/ipv6only-app/common/wifi_service/wifi_service.options
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.options
   PREFIX
     wifi_service
   DEPS
     pw_protobuf.common_protos
   STRIP_PREFIX
-    ${chip_dir}/examples/ipv6only-app/common/wifi_service
+    ${chip_dir}/examples/common/pigweed/protos
 )
 
 endif(matter_enable_rpc)
@@ -222,6 +222,7 @@ list(
     -DUSE_ZAP_CONFIG
     -DCHIP_HAVE_CONFIG_H
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
+    -DCONFIG_ENABLE_ROTATING_DEVICE_ID=1
 )
 
 if (matter_enable_rpc)
@@ -234,7 +235,6 @@ list(
     -DPW_RPC_LIGHTING_SERVICE=1
     -DPW_RPC_LOCKING_SERVICE=1
     -DCONFIG_ENABLE_PW_RPC=1
-    -DCONFIG_ENABLE_ROTATING_DEVICE_ID=1
 )
 endif (matter_enable_rpc)
 

From fa226c6091cbdafbb2a2fcfb9a08381937845b44 Mon Sep 17 00:00:00 2001
From: pankore <86098180+pankore@users.noreply.github.com>
Date: Tue, 15 Feb 2022 18:23:49 +0800
Subject: [PATCH 2/2] Add application specific macros

---
 examples/all-clusters-app/ameba/chip_main.cmake  | 1 +
 examples/lighting-app/ameba/chip_main.cmake      | 1 +
 examples/ota-requestor-app/ameba/chip_main.cmake | 1 +
 examples/pigweed-app/ameba/chip_main.cmake       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
index ce5fafb3795405..6e955282202e62 100755
--- a/examples/all-clusters-app/ameba/chip_main.cmake
+++ b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -223,6 +223,7 @@ list(
     -DCHIP_HAVE_CONFIG_H
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
     -DCONFIG_ENABLE_ROTATING_DEVICE_ID=1
+    -DMATTER_ALL_CLUSTERS_APP=1
 )
 
 if (matter_enable_rpc)
diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake
index 67328f0dfeb4dc..6b71cd2bbd6e43 100755
--- a/examples/lighting-app/ameba/chip_main.cmake
+++ b/examples/lighting-app/ameba/chip_main.cmake
@@ -79,6 +79,7 @@ list(
     -DUSE_ZAP_CONFIG
     -DCHIP_HAVE_CONFIG_H
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
+    -DMATTER_LIGHTING_APP=1
 )
 
 if (matter_enable_ota_requestor)
diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake
index 9f3b556f74e171..23b93b329580d3 100644
--- a/examples/ota-requestor-app/ameba/chip_main.cmake
+++ b/examples/ota-requestor-app/ameba/chip_main.cmake
@@ -72,6 +72,7 @@ list(
     -DUSE_ZAP_CONFIG
     -DCHIP_HAVE_CONFIG_H
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
+    -DMATTER_OTA_REQUESTOR_APP=1
 )
 
 list(
diff --git a/examples/pigweed-app/ameba/chip_main.cmake b/examples/pigweed-app/ameba/chip_main.cmake
index 95af00c585f1de..1eca361863b4c5 100644
--- a/examples/pigweed-app/ameba/chip_main.cmake
+++ b/examples/pigweed-app/ameba/chip_main.cmake
@@ -79,6 +79,7 @@ list(
     -DCHIP_HAVE_CONFIG_H
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
     -DCONFIG_ENABLE_PW_RPC=1
+    -DMATTER_PIGWEED_APP=1
 )
 
 list(