From 3241a67dc6b3ecb85af7d57a9cd95c638ee95a80 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Tue, 23 May 2023 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20GN=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #I77PSG Signed-off-by: zhushengle Change-Id: I095e5d0aac99eda1a8c238701e560655477b04d2 --- BUILD.gn | 8 ++++---- components/fs/fatfs/BUILD.gn | 2 +- components/fs/littlefs/BUILD.gn | 2 +- components/net/lwip-2.1/BUILD.gn | 4 ++-- components/security/userlib/BUILD.gn | 2 +- kal/cmsis/BUILD.gn | 2 +- kal/libc/iccarm/BUILD.gn | 4 ++-- kal/libc/musl/BUILD.gn | 4 ++-- kal/libc/newlib/BUILD.gn | 2 +- kal/libsec/BUILD.gn | 2 +- liteos.gni | 15 +++++++++++++-- testsuites/sample/kernel/dynlink/BUILD.gn | 13 +++---------- testsuites/sample/kernel/dynlink/It_los_dynlink.h | 1 + .../sample/kernel/dynlink/It_los_dynlink_002.c | 4 ++-- .../sample/kernel/dynlink/It_los_dynlink_011.c | 4 ++-- .../sample/kernel/dynlink/It_los_dynlink_013.c | 6 +++--- .../sample/kernel/dynlink/It_los_dynlink_020.c | 1 - testsuites/unittest/posix/BUILD.gn | 4 ++-- 18 files changed, 42 insertions(+), 38 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index b5efe743..bf097683 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -137,8 +137,8 @@ config("public") { ] if (BOARD_SOC_FEATURE) { - configs += [ "//device/board/$device_company:public" ] - configs += [ "//device/soc/$LOSCFG_SOC_COMPANY:public" ] + configs += [ "$DEVICE_BOARD_DIR/$device_company:public" ] + configs += [ "$DEVICE_SOC_DIR/$LOSCFG_SOC_COMPANY:public" ] } else { if (HAVE_DEVICE_SDK) { configs += [ "$device_path:public" ] @@ -158,8 +158,8 @@ group("modules") { ] if (BOARD_SOC_FEATURE) { - deps += [ "//device/board/$device_company" ] - deps += [ "//device/soc/$LOSCFG_SOC_COMPANY" ] + deps += [ "$DEVICE_BOARD_DIR/$device_company" ] + deps += [ "$DEVICE_SOC_DIR/$LOSCFG_SOC_COMPANY" ] } else { if (HAVE_DEVICE_SDK) { deps += [ device_path ] diff --git a/components/fs/fatfs/BUILD.gn b/components/fs/fatfs/BUILD.gn index 0c999cf0..03870145 100644 --- a/components/fs/fatfs/BUILD.gn +++ b/components/fs/fatfs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/FatFs/FatFs.gni") +import("$THIRDPARTY_FATFS_DIR/FatFs.gni") module_switch = defined(LOSCFG_FS_FAT) module_name = get_path_info(rebase_path("."), "name") diff --git a/components/fs/littlefs/BUILD.gn b/components/fs/littlefs/BUILD.gn index e835bda2..4c06b5da 100644 --- a/components/fs/littlefs/BUILD.gn +++ b/components/fs/littlefs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/littlefs/littlefs.gni") +import("$THIRDPARTY_LITTLEFS_DIR/littlefs.gni") module_switch = defined(LOSCFG_FS_LITTLEFS) module_name = get_path_info(rebase_path("."), "name") diff --git a/components/net/lwip-2.1/BUILD.gn b/components/net/lwip-2.1/BUILD.gn index 65025351..21f61bba 100644 --- a/components/net/lwip-2.1/BUILD.gn +++ b/components/net/lwip-2.1/BUILD.gn @@ -27,14 +27,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("$LITEOSTHIRDPARTY/lwip/lwip.gni") import("$LITEOSTOPDIR/components/net/lwip-2.1/lwip_porting.gni") +import("$THIRDPARTY_LWIP_DIR/lwip.gni") module_switch = defined(LOSCFG_NET_LWIP_SACK) module_name = "lwip" kernel_module(module_name) { sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES - [ "$LWIPDIR/api/sockets.c" ] - include_dirs = [ "//commonlibrary/utils_lite/include" ] + include_dirs = [ "$COMMONLIBRARY_UTILS_LITE_DIR/include" ] } config("public") { diff --git a/components/security/userlib/BUILD.gn b/components/security/userlib/BUILD.gn index efc57507..c0624f2c 100644 --- a/components/security/userlib/BUILD.gn +++ b/components/security/userlib/BUILD.gn @@ -33,5 +33,5 @@ module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { sources = [] - deps = [ "//third_party/musl/porting/liteos_m/user" ] + deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/user" ] } diff --git a/kal/cmsis/BUILD.gn b/kal/cmsis/BUILD.gn index 6bb15b1f..e65ca8fb 100644 --- a/kal/cmsis/BUILD.gn +++ b/kal/cmsis/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/cmsis/cmsis.gni") +import("$THIRDPARTY_CMSIS_DIR/cmsis.gni") module_switch = defined(LOSCFG_KAL_CMSIS) module_name = get_path_info(rebase_path("."), "name") diff --git a/kal/libc/iccarm/BUILD.gn b/kal/libc/iccarm/BUILD.gn index f20518d4..4d080140 100644 --- a/kal/libc/iccarm/BUILD.gn +++ b/kal/libc/iccarm/BUILD.gn @@ -27,14 +27,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/musl/porting/liteos_m_iccarm/kernel/iccarm.gni") +import("$THIRDPARTY_MUSL_DIR/porting/liteos_m_iccarm/kernel/iccarm.gni") module_switch = defined(LOSCFG_LIBC_ICCARM) module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { configs += [ "$LITEOSTOPDIR:warn_config" ] - deps = [ "//third_party/musl/porting/liteos_m_iccarm/kernel" ] + deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m_iccarm/kernel" ] } config("public") { diff --git a/kal/libc/musl/BUILD.gn b/kal/libc/musl/BUILD.gn index 371779c5..c0a3e06c 100644 --- a/kal/libc/musl/BUILD.gn +++ b/kal/libc/musl/BUILD.gn @@ -28,14 +28,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/musl/porting/liteos_m/kernel/musl.gni") +import("$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel/musl.gni") module_switch = defined(LOSCFG_LIBC_MUSL) module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { configs += [ "$LITEOSTOPDIR:warn_config" ] - deps = [ "//third_party/musl/porting/liteos_m/kernel" ] + deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel" ] } config("public") { diff --git a/kal/libc/newlib/BUILD.gn b/kal/libc/newlib/BUILD.gn index 5316628e..36ebf1e4 100644 --- a/kal/libc/newlib/BUILD.gn +++ b/kal/libc/newlib/BUILD.gn @@ -43,7 +43,7 @@ kernel_module(module_name) { if (defined(LOSCFG_FS_VFS)) { sources += - [ "//third_party/musl/porting/liteos_m/kernel/src/misc/realpath.c" ] + [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel/src/misc/realpath.c" ] } } diff --git a/kal/libsec/BUILD.gn b/kal/libsec/BUILD.gn index 53b70b1f..0374259a 100644 --- a/kal/libsec/BUILD.gn +++ b/kal/libsec/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//third_party/bounds_checking_function/libsec_src.gni") +import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { diff --git a/liteos.gni b/liteos.gni index 4a10574d..8aa28fb4 100644 --- a/liteos.gni +++ b/liteos.gni @@ -51,8 +51,19 @@ exec_script("//build/lite/run_shell_cmd.py", import("$root_out_dir/config.gni") LITEOSTOPDIR = "//kernel/liteos_m" -LITEOSTHIRDPARTY = "//third_party" HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos_m" +THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR = + "//third_party/bounds_checking_function" +LITEOSTHIRDPARTY = "//third_party" +THIRDPARTY_FATFS_DIR = "//third_party/FatFs" +THIRDPARTY_MUSL_DIR = "//third_party/musl" +THIRDPARTY_LITTLEFS_DIR = "//third_party/littlefs" +THIRDPARTY_CMSIS_DIR = "//third_party/cmsis" +THIRDPARTY_LWIP_DIR = "//third_party/lwip" +DEVICE_BOARD_DIR = "//device/board" +DEVICE_SOC_DIR = "//device/soc" +COMMONLIBRARY_UTILS_LITE_DIR = "//commonlibrary/utils_lite" +TEST_XTS_TOOLS_DIR = "//test/xts/tools" ARCH = "" if (defined(LOSCFG_ARCH_ARM_AARCH32)) { @@ -163,8 +174,8 @@ set_defaults("kernel_module") { "$LITEOSTOPDIR:los_config", ] visibility = [ - "$LITEOSTOPDIR:*", ":*", + "$LITEOSTOPDIR:*", "..:*", "../..:*", ] diff --git a/testsuites/sample/kernel/dynlink/BUILD.gn b/testsuites/sample/kernel/dynlink/BUILD.gn index 9574d126..f46398ae 100644 --- a/testsuites/sample/kernel/dynlink/BUILD.gn +++ b/testsuites/sample/kernel/dynlink/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("//kernel/liteos_m/liteos.gni") + static_library("test_dynlink") { sources = [ "It_los_dynlink.c", @@ -52,14 +54,5 @@ static_library("test_dynlink") { "It_los_dynlink_020.c", ] - include_dirs = [ - "../../../../kernel/include", - "../../../../kernel/arch/include", - "../../../include", - "../../../../utils", - "../../../../components/dynlink", - ".", - "../../../../components/cpup", - "//third_party/bounds_checking_function/include", - ] + configs += [ "$LITEOSTOPDIR/testsuites:include" ] } diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink.h b/testsuites/sample/kernel/dynlink/It_los_dynlink.h index 16bfed5d..d669cb43 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink.h +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink.h @@ -51,6 +51,7 @@ VOID ItLosDynlink007(VOID); VOID ItLosDynlink008(VOID); VOID ItLosDynlink009(VOID); VOID ItLosDynlink010(VOID); +VOID ItLosDynlink011(VOID); VOID ItLosDynlink012(VOID); VOID ItLosDynlink013(VOID); VOID ItLosDynlink014(VOID); diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_002.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_002.c index 954fe7ce..399a0a96 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_002.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_002.c @@ -33,8 +33,8 @@ /* Test invalid params */ STATIC UINT32 TestCase(VOID) { - VOID *handle = NULL; - VOID *invalHandle = NULL; + CHAR *handle = NULL; + CHAR *invalHandle = NULL; INT32 (*func)(INT32, INT32) = NULL; CHAR *symbolName = "test_api"; CHAR *dsoName = DSO_FULL_PATH("Align4_dynamic_align4.so"); diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_011.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_011.c index 2f77879b..c4737702 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_011.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_011.c @@ -34,7 +34,7 @@ STATIC UINT32 TestCase(VOID) { VOID *handle = NULL; - INT32 (*func)() = NULL; + INT32 (*func)(VOID) = NULL; INT32 *pValue = NULL; CHAR *symbolName1 = "dyn_bss_func"; CHAR *symbolName2 = "test_array"; @@ -44,7 +44,7 @@ STATIC UINT32 TestCase(VOID) handle = (VOID *)LOS_SoLoad(dsoName, NULL); ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle); - func = (INT32 (*)())LOS_FindSym(handle, symbolName1); + func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName1); ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT); ret = func(); ICUNIT_GOTO_EQUAL(ret, 2117, ret, EXIT); diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_013.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_013.c index 9c0e8533..aefe6b0b 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_013.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_013.c @@ -34,7 +34,7 @@ STATIC UINT32 TestCase(VOID) { VOID *handle = NULL; - INT32 (*func)() = NULL; + INT32 (*func)(VOID) = NULL; INT32 *pValueAddr = NULL; INT32 **ppValueAddr = NULL; CHAR *symbolName1 = "get_value100"; @@ -49,12 +49,12 @@ STATIC UINT32 TestCase(VOID) handle = (VOID *)LOS_SoLoad(dsoName, NULL); ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle); - func = (INT32 (*)())LOS_FindSym(handle, symbolName1); + func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName1); ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT); ret = func(); ICUNIT_GOTO_EQUAL(ret, 100, ret, EXIT); - func = (INT32 (*)())LOS_FindSym(handle, symbolName2); + func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName2); ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT); ret = func(); ICUNIT_GOTO_EQUAL(ret, 200, ret, EXIT); diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c index f4c4a788..d3587bf7 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c @@ -34,7 +34,6 @@ STATIC UINT32 TestCase(VOID) { VOID *handle = NULL; - VOID (*func)(INT32, INT32) = NULL; CHAR *dsoName = DSO_FULL_PATH("Align4_dynamic_stdlib.so"); handle = (VOID *)LOS_SoLoad(dsoName, NULL); diff --git a/testsuites/unittest/posix/BUILD.gn b/testsuites/unittest/posix/BUILD.gn index 4587154f..90dbc24e 100644 --- a/testsuites/unittest/posix/BUILD.gn +++ b/testsuites/unittest/posix/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_m/liteos.gni") -import("//test/xts/tools/lite/build/suite_lite.gni") +import("$TEST_XTS_TOOLS_DIR/lite/build/suite_lite.gni") static_library("posix_test") { sources = [ @@ -65,7 +65,7 @@ static_library("posix_test") { } include_dirs = [ - "//test/xts/tools/hctest/include", + "$TEST_XTS_TOOLS_DIR/hctest/include", "src", ]