From f3beb4b273c9a76fbfaffe57302f27d2a74cd2ba Mon Sep 17 00:00:00 2001
From: Caoruihong <crh.cao@huawei.com>
Date: Tue, 27 Jul 2021 16:46:30 +0800
Subject: [PATCH] feat: don't apply module_swith on configs of config

optimize the public config template

Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I0275b9a945ee87ca7893f8da6f30f9f5f65fa9ae
---
 drivers/BUILD.gn | 21 +++++++++------------
 liteos.gni       |  1 +
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/BUILD.gn b/drivers/BUILD.gn
index 08ef974c..a4344b9d 100644
--- a/drivers/BUILD.gn
+++ b/drivers/BUILD.gn
@@ -29,19 +29,16 @@
 
 import("//kernel/liteos_a/liteos.gni")
 
-module_switch = defined(LOSCFG_DRIVERS)
 group("drivers") {
-  if (module_switch) {
-    deps = [
-      "block/disk",
-      "char/bch",
-      "char/mem",
-      "char/quickstart",
-      "char/random",
-      "char/video",
-      "mtd/multi_partition",
-    ]
-  }
+  deps = [
+    "block/disk",
+    "char/bch",
+    "char/mem",
+    "char/quickstart",
+    "char/random",
+    "char/video",
+    "mtd/multi_partition",
+  ]
 }
 
 config("public") {
diff --git a/liteos.gni b/liteos.gni
index d4ee8660..a792d3aa 100644
--- a/liteos.gni
+++ b/liteos.gni
@@ -49,6 +49,7 @@ template("config") {
   config(target_name) {
     if (defined(invoker.module_switch) && !invoker.module_switch && target_name == "public") {
       not_needed(invoker, "*")
+      forward_variables_from(invoker, [ "configs" ])
     } else {
       forward_variables_from(invoker, "*")
     }