intial clean up

mkardous-silabs · Oct 27, 2023 · 9177b3f · 9177b3f
1 parent 518c313
commit 9177b3f
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 500 deletions.
diff --git a/examples/lit-icd-app/linux/AppOptions.cpp b/examples/lit-icd-app/linux/AppOptions.cpp
diff --git a/examples/lit-icd-app/linux/AppOptions.h b/examples/lit-icd-app/linux/AppOptions.h
diff --git a/examples/lit-icd-app/linux/BUILD.gn b/examples/lit-icd-app/linux/BUILD.gn
@@ -14,95 +14,30 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("${build_root}/config/compiler/compiler.gni")
 
-import("${chip_root}/src/lib/lib.gni")
-import("${chip_root}/src/platform/device.gni")
-
-source_set("chip-all-clusters-common") {
+executable("chip-lock-app") {
   sources = [
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "AppOptions.cpp",
-    "include/tv-callbacks.cpp",
-    "include/tv-callbacks.h",
-    "main-common.cpp",
+    "main.cpp",
+    "src/LockAppCommandDelegate.cpp",
   ]
 
   deps = [
-    "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
+    "${chip_root}/examples/lock-app/lock-common",
+    "${chip_root}/examples/lock-app/lock-common:lock-cluster-service",
     "${chip_root}/examples/platform/linux:app-main",
-    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
+    "${chip_root}/third_party/jsoncpp",
   ]
 
-  include_dirs =
-      [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ]
-
-  cflags = [ "-Wconversion" ]
-
-  if (chip_build_libshell) {
-    defines = [ "ENABLE_CHIP_SHELL" ]
-  }
-}
-
-source_set("chip-lock-app-common") {
-  sources = [
-    "${chip_root}/examples/lock-app/lock-common/include/LockEndpoint.h",
-    "${chip_root}/examples/lock-app/lock-common/include/LockManager.h",
-    "${chip_root}/examples/lock-app/lock-common/src/LockEndpoint.cpp",
-    "${chip_root}/examples/lock-app/lock-common/src/LockManager.cpp",
-    "${chip_root}/examples/lock-app/lock-common/src/ZCLDoorLockCallbacks.cpp",
-  ]
-
-  deps =
-      [ "${chip_root}/examples/all-clusters-minimal-app/all-clusters-common" ]
-
-  include_dirs = [ "${chip_root}/examples/lock-app/lock-common/include" ]
+  include_dirs = [ "include" ]
 
   cflags = [ "-Wconversion" ]
-}
-
-executable("chip-all-clusters-minimal-app") {
-  sources = [ "main.cpp" ]
-
-  deps = [
-    ":chip-all-clusters-common",
-    ":chip-lock-app-common",
-    "${chip_root}/examples/platform/linux:app-main",
-  ]
-
-  cflags = [ "-Wconversion" ]
-
-  include_dirs =
-      [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ]
 
   output_dir = root_out_dir
 }
 
-if (chip_device_platform == "darwin") {
-  action("codesign") {
-    script = "entitlements/codesign.py"
-    public_deps = [ ":chip-all-clusters-minimal-app" ]
-
-    args = [
-      "--target_path",
-      rebase_path("${root_build_dir}/chip-all-clusters-minimal-app",
-                  root_build_dir),
-      "--log_path",
-      rebase_path("${root_build_dir}/codesign_log.txt", root_build_dir),
-    ]
-
-    output_name = "codesign_log.txt"
-    outputs = [ "${root_build_dir}/${output_name}" ]
-  }
-}
-
 group("linux") {
-  deps = []
-  deps += [ ":chip-all-clusters-minimal-app" ]
+  deps = [ ":chip-lock-app" ]
 }
 
 group("default") {

diff --git a/examples/lit-icd-app/linux/Dockerfile b/examples/lit-icd-app/linux/Dockerfile
@@ -17,7 +17,7 @@
 
 from generic_node_image
 RUN apt-get install -y libglib2.0
-COPY out/debug/chip-all-clusters-minimal-app /usr/bin/
+COPY out/debug/chip-lit-icd-app /usr/bin/
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh", "server"]
diff --git a/examples/lit-icd-app/linux/args.gni b/examples/lit-icd-app/linux/args.gni
@@ -21,7 +21,6 @@ chip_project_config_include = "<CHIPProjectAppConfig.h>"
 chip_system_project_config_include = "<SystemProjectConfig.h>"
 
 chip_project_config_include_dirs =
-    [ "${chip_root}/examples/all-clusters-minimal-app/linux/include" ]
+    [ "${chip_root}/examples/lit-icd-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
 matter_enable_tracing_support = true
diff --git a/examples/lit-icd-app/linux/entitlements/codesign.py b/examples/lit-icd-app/linux/entitlements/codesign.py
diff --git a/examples/lit-icd-app/linux/entrypoint.sh b/examples/lit-icd-app/linux/entrypoint.sh
@@ -26,4 +26,4 @@ ot-ctl panid 0x1234
 ot-ctl ifconfig up
 ot-ctl thread start
 
-chip-all-clusters-minimal-app
+chip-lit-icd-app
diff --git a/examples/lit-icd-app/linux/fuzzing-main.cpp b/examples/lit-icd-app/linux/fuzzing-main.cpp