From 652e7625ee449a511604285e8d336f9a7b8a773b Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 27 May 2021 15:47:42 -0400
Subject: [PATCH 1/3] Linux platform example app includes SHELL
 unconditionally.

Force defines and linkages as such, otherwise compilation with GN
without 'use shell' does not work.

TODO as followup: if shell is really optional, build it as such in linux
as well.
---
 examples/platform/linux/BUILD.gn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn
index 189bd1310c6ac2..310dc8f43ff8fb 100644
--- a/examples/platform/linux/BUILD.gn
+++ b/examples/platform/linux/BUILD.gn
@@ -31,7 +31,7 @@ source_set("app-main") {
     "Options.h",
   ]
 
-  defines = []
+  defines = [ "CHIP_ENABLE_SHELL" ]
 
   if (chip_enable_pw_rpc) {
     defines += [ "PW_RPC_ENABLED" ]
@@ -40,12 +40,12 @@ source_set("app-main") {
   public_deps = [
     "${chip_root}/src/app/server",
     "${chip_root}/src/lib",
+    "${chip_root}/src/lib/shell",
+    "${chip_root}/src/lib/shell:shell_core",
   ]
 
-  if (chip_enable_shell) {
-    defines += [ "CHIP_ENABLE_SHELL" ]
-    public_deps += [ "${chip_root}/src/lib/shell" ]
-  }
+    public_deps += [ 
+    ]
 
   public_configs = [ ":app-main-config" ]
 }

From de6f2d7dc68aa22b20bef47c7972a1e0dbc22bd5 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 27 May 2021 15:54:03 -0400
Subject: [PATCH 2/3] remove the enable shell arg alltogether - it does not
 work because includes are already there

---
 examples/platform/linux/AppMain.cpp | 4 ----
 examples/platform/linux/BUILD.gn    | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
index c5968cb66a81e1..59ab87db15c1cf 100644
--- a/examples/platform/linux/AppMain.cpp
+++ b/examples/platform/linux/AppMain.cpp
@@ -112,15 +112,11 @@ int ChipLinuxAppInit(int argc, char ** argv)
 
 void ChipLinuxAppMainLoop()
 {
-#if CHIP_ENABLE_SHELL
     std::thread shellThread([]() { Engine::Root().RunMainLoop(); });
-#endif
 
     // Init ZCL Data Model and CHIP App Server
     InitServer();
 
     chip::DeviceLayer::PlatformMgr().RunEventLoop();
-#if CHIP_ENABLE_SHELL
     shellThread.join();
-#endif
 }
diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn
index 310dc8f43ff8fb..89157f9f945ef6 100644
--- a/examples/platform/linux/BUILD.gn
+++ b/examples/platform/linux/BUILD.gn
@@ -19,10 +19,6 @@ config("app-main-config") {
   include_dirs = [ "." ]
 }
 
-declare_args() {
-  chip_enable_shell = false
-}
-
 source_set("app-main") {
   sources = [
     "AppMain.cpp",
@@ -31,7 +27,7 @@ source_set("app-main") {
     "Options.h",
   ]
 
-  defines = [ "CHIP_ENABLE_SHELL" ]
+  defines = []
 
   if (chip_enable_pw_rpc) {
     defines += [ "PW_RPC_ENABLED" ]

From 74e7ab14151ba59383893132e9deca0644994e61 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 27 May 2021 17:44:58 -0400
Subject: [PATCH 3/3] Revert "Fix relative path for the markdown link (#7202)"

This reverts commit 7a172f3ee35cb396c5bad9491ec18c1e30a92322.
Apparently link checker is not fully working and this broke doxygen.
---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index c7a9d2ab81433a..ef6e6223b99a30 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -6,7 +6,7 @@
     [the build guide](./BUILDING.md)
 -   Documentation about running [cirque](https://github.com/openweave/cirque)
     tests can be found in
-    [the cirque test guide](../src/test_driver/linux-cirque/README.md)
+    [the cirque test guide](src/test_driver/linux-cirque/README.md)
 -   Documentation about standard build & development flows using
     [Visual Studio Code](https://code.visualstudio.com/) can be found in
     [the development guide](./VSCODE_DEVELOPMENT.md)