!467 将public config中的configs改为不受module_switch影响

Merge pull request !467 from Caoruihong/decouple_hdf_config
This commit is contained in:
openharmony_ci 2021-07-28 03:40:55 +00:00 committed by Gitee
commit def22d3fd1
2 changed files with 10 additions and 12 deletions

View File

@ -29,9 +29,7 @@
import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/liteos.gni")
module_switch = defined(LOSCFG_DRIVERS)
group("drivers") { group("drivers") {
if (module_switch) {
deps = [ deps = [
"block/disk", "block/disk",
"char/bch", "char/bch",
@ -42,7 +40,6 @@ group("drivers") {
"mtd/multi_partition", "mtd/multi_partition",
] ]
} }
}
config("public") { config("public") {
configs = [ configs = [

View File

@ -49,6 +49,7 @@ template("config") {
config(target_name) { config(target_name) {
if (defined(invoker.module_switch) && !invoker.module_switch && target_name == "public") { if (defined(invoker.module_switch) && !invoker.module_switch && target_name == "public") {
not_needed(invoker, "*") not_needed(invoker, "*")
forward_variables_from(invoker, [ "configs" ])
} else { } else {
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
} }