From deff7c921f606ed85663f91d21c12163c15aa7f8 Mon Sep 17 00:00:00 2001 From: wangchen <253227059@qq.com> Date: Tue, 24 Aug 2021 10:04:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20M=E6=A0=B8=E7=BC=96=E8=AF=91=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】完善M核编译配置选项。 【修改方案】 1，在build.gn中添加config.gni的包含 2，修改部分build.gn中的格式规范问题 【影响】 对现有的产品编译不会有影响。 re #I46XEA Signed-off-by: wangchen <253227059@qq.com> --- BUILD.gn | 24 ++++++++++++------------ components/fs/BUILD.gn | 4 ++-- components/net/lwip-2.1/lwip_porting.gni | 2 +- components/shell/BUILD.gn | 2 +- kal/BUILD.gn | 4 ++-- kernel/BUILD.gn | 4 +++- testsuits/BUILD.gn | 4 ++-- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d67e6344..ad127914 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -35,40 +35,40 @@ group("kernel") { "utils:utils", "//third_party/bounds_checking_function:libsec_static", ] - if (enable_ohos_kernel_liteos_m_cppsupport == true) { + if (enable_ohos_kernel_liteos_m_cppsupport) { deps += [ "components/cppsupport:cppsupport" ] } - if (enable_ohos_kernel_liteos_m_cpup == true) { + if (enable_ohos_kernel_liteos_m_cpup) { deps += [ "components/cpup:cpup" ] } - if (enable_ohos_kernel_liteos_m_exchook == true) { + if (enable_ohos_kernel_liteos_m_exchook) { deps += [ "components/exchook:exchook" ] } - if (enable_ohos_kernel_liteos_m_backtrace == true) { + if (enable_ohos_kernel_liteos_m_backtrace) { deps += [ "components/backtrace:backtrace" ] } - if (enable_ohos_kernel_liteos_m_fs == true) { + if (enable_ohos_kernel_liteos_m_fs) { deps += [ "components/fs:fs" ] } - if (enable_ohos_kernel_liteos_m_pm == true) { + if (enable_ohos_kernel_liteos_m_pm) { deps += [ "components/power:pm" ] } - if (enable_ohos_kernel_liteos_m_trace == true) { + if (enable_ohos_kernel_liteos_m_trace) { deps += [ "components/trace:trace" ] } - if (enable_ohos_kernel_liteos_m_kal == true) { + if (enable_ohos_kernel_liteos_m_kal) { deps += [ "kal:kal" ] } - if (enable_ohos_kernel_liteos_m_shell == true) { + if (enable_ohos_kernel_liteos_m_shell) { deps += [ "components/shell:shell" ] } - if (enable_ohos_kernel_liteos_m_test == true) { + if (enable_ohos_kernel_liteos_m_test) { deps += [ "testsuits:test" ] } - if (enable_ohos_kernel_liteos_m_lwip == true) { + if (enable_ohos_kernel_liteos_m_lwip) { deps += [ ohos_kernel_liteos_m_lwip_path ] } - if (enable_ohos_kernel_liteos_m_dynlink == true) { + if (enable_ohos_kernel_liteos_m_dynlink) { deps += [ "components/dynlink:dynlink" ] } } diff --git a/components/fs/BUILD.gn b/components/fs/BUILD.gn index 0b509070..16675cdd 100644 --- a/components/fs/BUILD.gn +++ b/components/fs/BUILD.gn @@ -49,10 +49,10 @@ declare_args() { group("fs") { deps = [] deps += [ ".:fs_operations" ] - if (enable_ohos_kernel_liteos_m_fatfs == true) { + if (enable_ohos_kernel_liteos_m_fatfs) { deps += [ "fatfs:fatfs" ] } - if (enable_ohos_kernel_liteos_m_littlefs == true) { + if (enable_ohos_kernel_liteos_m_littlefs) { deps += [ "littlefs:littlefs" ] } } diff --git a/components/net/lwip-2.1/lwip_porting.gni b/components/net/lwip-2.1/lwip_porting.gni index b4453902..9a0b631b 100755 --- a/components/net/lwip-2.1/lwip_porting.gni +++ b/components/net/lwip-2.1/lwip_porting.gni @@ -40,6 +40,6 @@ LWIP_PORTING_FILES = [ "$LWIP_PORTING_DIR/enhancement/src/lwip_ifaddrs.c", ] -if (enable_ohos_kernel_liteos_m_shell == true) { +if (enable_ohos_kernel_liteos_m_shell) { LWIP_PORTING_FILES += [ "$LWIP_PORTING_DIR/porting/src/api_shell.c" ] } diff --git a/components/shell/BUILD.gn b/components/shell/BUILD.gn index 638791b8..02742bab 100644 --- a/components/shell/BUILD.gn +++ b/components/shell/BUILD.gn @@ -50,7 +50,7 @@ static_library("shell") { "./include", ] - if (enable_ohos_kernel_liteos_m_lwip == true) { + if (enable_ohos_kernel_liteos_m_lwip) { defines = [ "LWIP_SHELLCMD_ENABLE" ] } deps = [ diff --git a/kal/BUILD.gn b/kal/BUILD.gn index da59f5a6..295668d7 100644 --- a/kal/BUILD.gn +++ b/kal/BUILD.gn @@ -37,11 +37,11 @@ declare_args() { lite_component("kal") { features = [] - if (enable_ohos_kernel_liteos_m_cmsis == true) { + if (enable_ohos_kernel_liteos_m_cmsis) { features += [ "cmsis" ] } - if (enable_ohos_kernel_liteos_m_posix == true) { + if (enable_ohos_kernel_liteos_m_posix) { features += [ "posix" ] } } diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn index 701fab5b..043adac4 100644 --- a/kernel/BUILD.gn +++ b/kernel/BUILD.gn @@ -27,6 +27,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import("../config.gni") + static_library("kernel") { sources = [ "src/los_event.c", @@ -62,7 +64,7 @@ static_library("kernel") { } else if ("$board_cpu" == "cortex-m7") { deps = [ "arch/arm/cortex-m7/gcc/:arch" ] } else if ("$board_cpu" == "cortex-m33") { - if (enable_ohos_kernel_liteos_m_tz == true) { + if (enable_ohos_kernel_liteos_m_tz) { deps = [ "arch/arm/cortex-m33/gcc/TZ:arch" ] } else { deps = [ "arch/arm/cortex-m33/gcc/NTZ:arch" ] diff --git a/testsuits/BUILD.gn b/testsuits/BUILD.gn index cb6e396f..541c5a93 100644 --- a/testsuits/BUILD.gn +++ b/testsuits/BUILD.gn @@ -43,7 +43,7 @@ config("include") { "//kernel/liteos_m/components/cpup", ] - if (enable_ohos_kernel_liteos_m_test_full == true) { + if (enable_ohos_kernel_liteos_m_test_full) { defines += [ "LOS_KERNEL_TEST_FULL=1" ] } } @@ -71,7 +71,7 @@ lite_component("test") { #"sample/kernel/tickless:test_tickless", ] - if (enable_ohos_kernel_liteos_m_dynlink == true) { + if (enable_ohos_kernel_liteos_m_dynlink) { features += [ "sample/kernel/dynlink:test_dynlink" ] } }