From 28b00b74b9c4a33af45c66dab93458e9eccce4d2 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 5 Oct 2021 12:04:01 -0400 Subject: [PATCH 1/3] lock app does not compile with -rpc --- scripts/build/build/targets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index a818e7930caaf9..8b642826084427 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -99,10 +99,10 @@ def Efr32Targets(): board=Efr32Board.BRD4161A) yield efr_target.Extend('window-covering', app=Efr32App.WINDOW_COVERING) + yield efr_target.Extend('lock', app=Efr32App.LOCK), rpc_aware_targets = [ efr_target.Extend('light', app=Efr32App.LIGHT), - efr_target.Extend('lock', app=Efr32App.LOCK), ] for target in rpc_aware_targets: From 7dbd2c50de9ce9750314cefd038c51fffe0873b9 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 5 Oct 2021 12:13:36 -0400 Subject: [PATCH 2/3] Fix extra , --- scripts/build/build/targets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 8b642826084427..72e7496e4c6a66 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -99,7 +99,7 @@ def Efr32Targets(): board=Efr32Board.BRD4161A) yield efr_target.Extend('window-covering', app=Efr32App.WINDOW_COVERING) - yield efr_target.Extend('lock', app=Efr32App.LOCK), + yield efr_target.Extend('lock', app=Efr32App.LOCK) rpc_aware_targets = [ efr_target.Extend('light', app=Efr32App.LIGHT), From 76063e632d980f476b938728e54894dc2a9fbff1 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 5 Oct 2021 12:15:32 -0400 Subject: [PATCH 3/3] Fix unit tests --- .vscode/tasks.json | 1 - scripts/build/testdata/all_targets_except_host.txt | 1 - scripts/build/testdata/build_all_except_host.txt | 6 ------ 3 files changed, 8 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bb2f3415b892b5..9ab3183dc7159f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -217,7 +217,6 @@ "android-x86-chip-tool", "efr32-brd4161a-light-rpc", "efr32-brd4161a-light", - "efr32-brd4161a-lock-rpc", "efr32-brd4161a-lock", "efr32-brd4161a-window-covering", "esp32-c3devkit-all-clusters", diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index a9a1ee98709136..8e4611d245bee3 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -5,7 +5,6 @@ android-x86-chip-tool efr32-brd4161a-light efr32-brd4161a-light-rpc efr32-brd4161a-lock -efr32-brd4161a-lock-rpc efr32-brd4161a-window-covering esp32-c3devkit-all-clusters esp32-devkitc-all-clusters diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index f563f5cea6ccfa..653c051be18c39 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -55,9 +55,6 @@ gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 ' # Generating efr32-brd4161a-lock gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-lock -# Generating efr32-brd4161a-lock-rpc -gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-lock-rpc - # Generating efr32-brd4161a-window-covering gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-window-covering @@ -255,9 +252,6 @@ ninja -C {out}/efr32-brd4161a-light-rpc # Building efr32-brd4161a-lock ninja -C {out}/efr32-brd4161a-lock -# Building efr32-brd4161a-lock-rpc -ninja -C {out}/efr32-brd4161a-lock-rpc - # Building efr32-brd4161a-window-covering ninja -C {out}/efr32-brd4161a-window-covering