Remove static-supported-modes-option-manager as target from BUILD.gn

project-chip · Nov 9, 2021 · ce3b8f2 · ce3b8f2
1 parent dc21b2e
commit ce3b8f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 48 deletions.
diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
@@ -15,42 +15,24 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
-static_library("static-supported-modes-manager") {
-  sources = [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp" ]
-
-  #zap_pregenerated_dir = "${chip_root}/zzz_generated"
-
-  deps = []
-  deps += [
-    "${chip_root}/src/app",
-    "${chip_root}/src/app/common:cluster-objects",
-    "${chip_root}/src/controller",
-    "${chip_root}/src/lib/core",
-  ]
-  include_dirs = [
-    "include",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-    "${chip_root}/src",
-    "${chip_root}/zzz_generated/all-clusters-app",
-  ]
-
-  cflags = [ "-Wconversion" ]
-}
-
 executable("chip-all-clusters-app") {
   sources = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "include/tv-callbacks.cpp",
     "main.cpp",
   ]
 
   deps = [
-    ":static-supported-modes-manager",
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/lib",
   ]
 
+  include_dirs = [
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/include"
+  ]
+
   cflags = [ "-Wconversion" ]
 
   output_dir = root_out_dir

diff --git a/examples/all-clusters-app/p6/BUILD.gn b/examples/all-clusters-app/p6/BUILD.gn
@@ -54,37 +54,14 @@ p6_sdk_sources("all_clusters_app_sdk_sources") {
   public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ]
 }
 
-static_library("static-supported-modes-manager") {
-  sources = [ "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp" ]
-
-  #zap_pregenerated_dir = "${chip_root}/zzz_generated"
-
-  public_deps = []
-  public_deps += [
-    "${chip_root}/src/app",
-    "${chip_root}/src/app/common:cluster-objects",
-    "${chip_root}/src/controller",
-    "${chip_root}/src/lib/core",
-  ]
-  include_dirs = [
-    "${chip_root}",
-    "${chip_root}/src",
-    "${chip_root}/zzz_generated/all-clusters-app",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-  ]
-
-  cflags = [ "-Wconversion" ]
-
-  print("include_dirs = ")
-}
-
 p6_executable("clusters_app") {
   include_dirs = []
   defines = []
   output_name = "chip-p6-clusters-example.out"
 
   sources = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",
     "${examples_plat_dir}/init_p6Platform.cpp",
     "src/AppTask.cpp",
@@ -96,7 +73,6 @@ p6_executable("clusters_app") {
 
   deps = [
     ":all_clusters_app_sdk_sources",
-    ":static-supported-modes-manager",
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/src/lib",
@@ -107,6 +83,7 @@ p6_executable("clusters_app") {
     "include",
     "${examples_plat_dir}",
     "${p6_project_dir}/include",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
   ]
 
   defines = []