From e5636f7acaf7e8b7d14dc07930b2a16c86e63c85 Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Sat, 13 Nov 2021 19:59:04 +0800 Subject: [PATCH] feat(build): add module_group and comment out arch_cflags Signed-off-by: Caoruihong Change-Id: I83a248d313ec64a5bca6eb860fb84385aac446a0 --- BUILD.gn | 2 +- liteos.gni | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index be0a0665..1841ea91 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -207,7 +207,7 @@ config("misc_config") { config("los_config") { configs = [ - ":arch_config", + #":arch_config", ":kconfig_config", #":stdinc_config", diff --git a/liteos.gni b/liteos.gni index 8c43e5a0..fc618f94 100644 --- a/liteos.gni +++ b/liteos.gni @@ -114,6 +114,28 @@ template("config") { } } +template("module_group") { + assert(defined(invoker.modules), "modules are must") + group(target_name) { + deps = [] + foreach(m, invoker.modules) { + deps += [ m ] + } + if (defined(invoker.deps)) { + deps += invoker.deps + } + } + config("public") { + configs = [] + foreach(m, invoker.modules) { + configs += [ "$m:public" ] + } + if (defined(invoker.configs)) { + configs += invoker.configs + } + } +} + set_defaults("kernel_module") { configs = [ "$LITEOSTOPDIR:public", @@ -121,6 +143,7 @@ set_defaults("kernel_module") { ] visibility = [ "$LITEOSTOPDIR/*", - "../*", + "..:*", + ":*", ] }