From 1f3a6c8143830e5b965044288dd2794a4dc925e4 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Tue, 23 May 2023 14:50:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20GN=E8=84=9A=E6=9C=AC=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhushengle Change-Id: I80b055091a0ff333a859cd35447a851296a67103 --- BUILD.gn | 8 ++++---- apps/mksh/BUILD.gn | 4 ++-- apps/toybox/BUILD.gn | 4 ++-- drivers/char/bch/BUILD.gn | 2 +- drivers/char/video/BUILD.gn | 2 +- fs/fat/BUILD.gn | 2 +- fs/jffs2/BUILD.gn | 2 +- fs/nfs/BUILD.gn | 2 +- fs/ramfs/BUILD.gn | 2 +- fs/romfs/BUILD.gn | 2 +- fs/vfs/BUILD.gn | 2 +- kernel/extended/hilog/BUILD.gn | 6 +++--- kernel/extended/pipes/BUILD.gn | 2 +- lib/libc/musl/BUILD.gn | 7 ++----- lib/libc/newlib/BUILD.gn | 2 +- lib/libscrew/BUILD.gn | 2 +- lib/libsec/BUILD.gn | 2 +- liteos.gni | 15 ++++++++++++++- testsuites/kernel/BUILD.gn | 4 ++-- testsuites/unittest/basic/BUILD.gn | 6 ++---- testsuites/unittest/basic/config.gni | 3 ++- testsuites/unittest/container/BUILD.gn | 5 +++-- testsuites/unittest/container/config.gni | 2 +- testsuites/unittest/drivers/BUILD.gn | 6 ++---- testsuites/unittest/drivers/config.gni | 3 ++- testsuites/unittest/extended/BUILD.gn | 6 ++---- testsuites/unittest/extended/config.gni | 3 ++- testsuites/unittest/fs/BUILD.gn | 8 +++----- testsuites/unittest/fs/config.gni | 3 ++- testsuites/unittest/libc/io/BUILD.gn | 6 ++---- testsuites/unittest/libc/io/config.gni | 3 ++- testsuites/unittest/libc/misc/BUILD.gn | 6 ++---- testsuites/unittest/libc/misc/config.gni | 3 ++- testsuites/unittest/libc/posix/BUILD.gn | 6 ++---- testsuites/unittest/libc/posix/config.gni | 3 ++- testsuites/unittest/libc/sys/BUILD.gn | 6 ++---- testsuites/unittest/libc/sys/config.gni | 3 ++- testsuites/unittest/libc/time/BUILD.gn | 6 ++---- testsuites/unittest/libc/time/config.gni | 3 ++- testsuites/unittest/libc/util/BUILD.gn | 6 ++---- testsuites/unittest/libc/util/config.gni | 3 ++- testsuites/unittest/net/BUILD.gn | 6 ++---- testsuites/unittest/net/config.gni | 3 ++- .../unittest/process/basic/process/BUILD.gn | 6 ++---- .../unittest/process/basic/process/config.gni | 3 ++- .../unittest/process/basic/pthread/BUILD.gn | 6 ++---- .../unittest/process/basic/pthread/config.gni | 3 ++- testsuites/unittest/process/fs/BUILD.gn | 5 +++-- testsuites/unittest/process/fs/config.gni | 2 +- testsuites/unittest/process/lock/BUILD.gn | 6 ++---- testsuites/unittest/process/lock/config.gni | 3 ++- testsuites/unittest/process/plimits/BUILD.gn | 5 +++-- testsuites/unittest/process/plimits/config.gni | 2 +- testsuites/unittest/security/BUILD.gn | 6 ++---- testsuites/unittest/security/config.gni | 3 ++- 55 files changed, 114 insertions(+), 116 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 4faac14f..4ba2c2ff 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -299,7 +299,7 @@ config("public") { configs += [ "$HDFTOPDIR:public", - "//drivers/liteos:public", + "$DRIVERS_LITEOS_DIR:public", ] if (HAVE_DEVICE_SDK) { @@ -324,8 +324,8 @@ group("modules") { ] deps += [ - "//drivers/liteos", - HDFTOPDIR, + "$DRIVERS_LITEOS_DIR", + "$HDFTOPDIR", ] if (HAVE_DEVICE_SDK) { @@ -351,7 +351,7 @@ group("liteos_a") { deps += [ ":apps", ":tests", - "//third_party/musl/scripts/build_lite:strip", + "$THIRDPARTY_MUSL_DIR/scripts/build_lite:strip", ] if (liteos_skip_make == false) { deps += [ ":make" ] diff --git a/apps/mksh/BUILD.gn b/apps/mksh/BUILD.gn index 5ae70887..2e9c46d6 100644 --- a/apps/mksh/BUILD.gn +++ b/apps/mksh/BUILD.gn @@ -29,7 +29,7 @@ import("//build/lite/config/component/lite_component.gni") import("//kernel/liteos_a/liteos.gni") -import("//third_party/mksh/mksh.gni") +import("$THIRDPARTY_MKSH_DIR/mksh.gni") group("mksh") { deps = [ ":build_mksh" ] @@ -42,7 +42,7 @@ copy("copy_mksh_src") { build_ext_component("build_mksh") { deps = [ ":copy_mksh_src" ] - deps += [ "//third_party/musl:sysroot_lite" ] + deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ] exec_path = rebase_path("$target_out_dir/mksh_build") cflags = [ diff --git a/apps/toybox/BUILD.gn b/apps/toybox/BUILD.gn index 61e765ae..e347c372 100644 --- a/apps/toybox/BUILD.gn +++ b/apps/toybox/BUILD.gn @@ -29,7 +29,7 @@ import("//build/lite/config/component/lite_component.gni") import("//kernel/liteos_a/liteos.gni") -import("//third_party/toybox/toybox.gni") +import("$THIRDPARTY_TOYBOX_DIR/toybox.gni") group("toybox") { deps = [ ":build_toybox" ] @@ -51,7 +51,7 @@ build_ext_component("build_toybox") { ":copy_toybox_config", ":copy_toybox_src", ] - deps += [ "//third_party/musl:sysroot_lite" ] + deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ] exec_path = rebase_path("$target_out_dir/toybox_build") cflags = [ diff --git a/drivers/char/bch/BUILD.gn b/drivers/char/bch/BUILD.gn index 634b1e7c..16f29213 100644 --- a/drivers/char/bch/BUILD.gn +++ b/drivers/char/bch/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE) module_name = get_path_info(rebase_path("."), "name") diff --git a/drivers/char/video/BUILD.gn b/drivers/char/video/BUILD.gn index a7fcc3f9..b6395569 100644 --- a/drivers/char/video/BUILD.gn +++ b/drivers/char/video/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_DRIVERS_VIDEO) module_name = get_path_info(rebase_path("."), "name") diff --git a/fs/fat/BUILD.gn b/fs/fat/BUILD.gn index 921f9ea6..d87d32e1 100644 --- a/fs/fat/BUILD.gn +++ b/fs/fat/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/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/fs/jffs2/BUILD.gn b/fs/jffs2/BUILD.gn index dea3bd7c..c184f753 100644 --- a/fs/jffs2/BUILD.gn +++ b/fs/jffs2/BUILD.gn @@ -31,7 +31,7 @@ import("//kernel/liteos_a/liteos.gni") module_switch = defined(LOSCFG_FS_JFFS) module_name = get_path_info(rebase_path("."), "name") -linux_path = rebase_path("//kernel/linux/linux-5.10") +linux_path = rebase_path("$KERNEL_LINUX_DIR") out_path = rebase_path(target_out_dir) kernel_module(module_name) { diff --git a/fs/nfs/BUILD.gn b/fs/nfs/BUILD.gn index 4a5c8cf4..c48f95eb 100644 --- a/fs/nfs/BUILD.gn +++ b/fs/nfs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_FS_NFS) module_name = get_path_info(rebase_path("."), "name") diff --git a/fs/ramfs/BUILD.gn b/fs/ramfs/BUILD.gn index 716f4c3a..1f95d11c 100644 --- a/fs/ramfs/BUILD.gn +++ b/fs/ramfs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_FS_RAMFS) module_name = get_path_info(rebase_path("."), "name") diff --git a/fs/romfs/BUILD.gn b/fs/romfs/BUILD.gn index 4e371f7d..e01fc43b 100644 --- a/fs/romfs/BUILD.gn +++ b/fs/romfs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_FS_ROMFS) module_name = get_path_info(rebase_path("."), "name") diff --git a/fs/vfs/BUILD.gn b/fs/vfs/BUILD.gn index d5b1d53d..96c181d1 100644 --- a/fs/vfs/BUILD.gn +++ b/fs/vfs/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_FS_VFS) module_name = get_path_info(rebase_path("."), "name") diff --git a/kernel/extended/hilog/BUILD.gn b/kernel/extended/hilog/BUILD.gn index b925ff76..857a3c3c 100644 --- a/kernel/extended/hilog/BUILD.gn +++ b/kernel/extended/hilog/BUILD.gn @@ -33,7 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_HILOG) module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { sources = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c", + "$HIVIEWDFX_HILOG_LITE_DIR/frameworks/featured/hiview_log.c", "los_hilog.c", ] @@ -42,8 +42,8 @@ kernel_module(module_name) { config("public") { include_dirs = [ - "//base/hiviewdfx/hilog_lite/interfaces/native/kits", - "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", + "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits", + "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits/hilog", ".", ] } diff --git a/kernel/extended/pipes/BUILD.gn b/kernel/extended/pipes/BUILD.gn index 5d589735..c70cf4df 100644 --- a/kernel/extended/pipes/BUILD.gn +++ b/kernel/extended/pipes/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/NuttX/NuttX.gni") +import("$THIRDPARTY_NUTTX_DIR/NuttX.gni") module_switch = defined(LOSCFG_KERNEL_PIPE) module_name = get_path_info(rebase_path("."), "name") diff --git a/lib/libc/musl/BUILD.gn b/lib/libc/musl/BUILD.gn index df8b3507..0fdde2b3 100644 --- a/lib/libc/musl/BUILD.gn +++ b/lib/libc/musl/BUILD.gn @@ -28,11 +28,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") - -MUSLDIR = "$LITEOSTHIRDPARTY/musl" - -import("//third_party/optimized-routines/optimized-routines.gni") -import("$MUSLDIR/porting/liteos_a/kernel/musl.gni") +import("$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/musl.gni") +import("$THIRDPARTY_OPTIMIZED_ROUTINES_DIR/optimized-routines.gni") module_switch = defined(LOSCFG_LIBC_MUSL) module_name = get_path_info(rebase_path("."), "name") diff --git a/lib/libc/newlib/BUILD.gn b/lib/libc/newlib/BUILD.gn index f78432c4..7560d4fc 100644 --- a/lib/libc/newlib/BUILD.gn +++ b/lib/libc/newlib/BUILD.gn @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/musl/porting/liteos_a_newlib/kernel/newlib.gni") +import("$THIRDPARTY_MUSL_DIR/porting/liteos_a_newlib/kernel/newlib.gni") module_switch = defined(LOSCFG_LIBC_NEWLIB) module_name = get_path_info(rebase_path("."), "name") diff --git a/lib/libscrew/BUILD.gn b/lib/libscrew/BUILD.gn index e3cb2647..691915b0 100644 --- a/lib/libscrew/BUILD.gn +++ b/lib/libscrew/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/FreeBSD/FreeBSD.gni") +import("$THIRDPARTY_FREEBSD_DIR/FreeBSD.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { diff --git a/lib/libsec/BUILD.gn b/lib/libsec/BUILD.gn index ae17c178..523cb219 100644 --- a/lib/libsec/BUILD.gn +++ b/lib/libsec/BUILD.gn @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//kernel/liteos_a/liteos.gni") -import("//third_party/bounds_checking_function/libsec_src.gni") +import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni") module_switch = defined(LOSCFG_LIB_LIBC) module_name = get_path_info(rebase_path("."), "name") diff --git a/liteos.gni b/liteos.gni index 5ec817f4..6deef994 100644 --- a/liteos.gni +++ b/liteos.gni @@ -32,6 +32,19 @@ import("$root_out_dir/config.gni") LITEOSTOPDIR = "//kernel/liteos_a" LITEOSTHIRDPARTY = "//third_party" HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos" +HIVIEWDFX_HILOG_LITE_DIR = "//base/hiviewdfx/hilog_lite" +DRIVERS_LITEOS_DIR = "//drivers/liteos" +THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR = + "//third_party/bounds_checking_function" +THIRDPARTY_FATFS_DIR = "//third_party/FatFs" +THIRDPARTY_NUTTX_DIR = "//third_party/NuttX" +THIRDPARTY_MUSL_DIR = "//third_party/musl" +THIRDPARTY_TOYBOX_DIR = "//third_party/toybox" +THIRDPARTY_MKSH_DIR = "//third_party/mksh" +THIRDPARTY_FREEBSD_DIR = "//third_party/FreeBSD" +THIRDPARTY_OPTIMIZED_ROUTINES_DIR = "//third_party/optimized-routines" +THIRDPARTY_GOOGLETEST_DIR = "//third_party/googletest" +KERNEL_LINUX_DIR = "//kernel/linux/linux-5.10" ARCH = "" if (defined(LOSCFG_ARCH_ARM_AARCH32)) { @@ -135,8 +148,8 @@ set_defaults("kernel_module") { "$LITEOSTOPDIR:los_config", ] visibility = [ - "$LITEOSTOPDIR:*", ":*", + "$LITEOSTOPDIR:*", "..:*", "../..:*", ] diff --git a/testsuites/kernel/BUILD.gn b/testsuites/kernel/BUILD.gn index 47987d1f..79cc074e 100644 --- a/testsuites/kernel/BUILD.gn +++ b/testsuites/kernel/BUILD.gn @@ -45,8 +45,8 @@ config("liteos_kernel_test_public") { "$LITEOSTOPDIR/arch/arm/arm/include", "$LITEOSTOPDIR/arch/arm/include", "$LITEOSTOPDIR/extended/include", - "//third_party/musl/porting/liteos_a/kernel/include", - "//third_party/bounds_checking_function/include/", + "$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/include", + "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/include/", "$LITEOSTOPDIR/lib/libscrew/include", "$LITEOSTOPDIR/fs/vfs", "$LITEOSTOPDIR/fs/proc/include", diff --git a/testsuites/unittest/basic/BUILD.gn b/testsuites/unittest/basic/BUILD.gn index 19b381fd..bf8ff3e5 100644 --- a/testsuites/unittest/basic/BUILD.gn +++ b/testsuites/unittest/basic/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/basic/config.gni b/testsuites/unittest/basic/config.gni index 4b18bbde..8f372411 100644 --- a/testsuites/unittest/basic/config.gni +++ b/testsuites/unittest/basic/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ] diff --git a/testsuites/unittest/container/BUILD.gn b/testsuites/unittest/container/BUILD.gn index 9fe3d401..bc53409a 100644 --- a/testsuites/unittest/container/BUILD.gn +++ b/testsuites/unittest/container/BUILD.gn @@ -27,6 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") @@ -69,7 +70,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { "..:public_config_for_door", ":container_config", ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -85,6 +86,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { "..:public_config_for_all", ":container_config", ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/container/config.gni b/testsuites/unittest/container/config.gni index b5f40750..35c55da9 100644 --- a/testsuites/unittest/container/config.gni +++ b/testsuites/unittest/container/config.gni @@ -29,7 +29,7 @@ import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", "$TEST_UNITTEST_DIR/container", ] diff --git a/testsuites/unittest/drivers/BUILD.gn b/testsuites/unittest/drivers/BUILD.gn index bcd19c53..eb3d7c4f 100644 --- a/testsuites/unittest/drivers/BUILD.gn +++ b/testsuites/unittest/drivers/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/drivers/config.gni b/testsuites/unittest/drivers/config.gni index 53a75c75..161d42fe 100644 --- a/testsuites/unittest/drivers/config.gni +++ b/testsuites/unittest/drivers/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ] diff --git a/testsuites/unittest/extended/BUILD.gn b/testsuites/unittest/extended/BUILD.gn index a218fdea..f57067ae 100644 --- a/testsuites/unittest/extended/BUILD.gn +++ b/testsuites/unittest/extended/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/extended/config.gni b/testsuites/unittest/extended/config.gni index 710c975f..3a341b62 100644 --- a/testsuites/unittest/extended/config.gni +++ b/testsuites/unittest/extended/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ] diff --git a/testsuites/unittest/fs/BUILD.gn b/testsuites/unittest/fs/BUILD.gn index 43934be5..1b108871 100644 --- a/testsuites/unittest/fs/BUILD.gn +++ b/testsuites/unittest/fs/BUILD.gn @@ -27,8 +27,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -43,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_pressure = [] sources += sources_pressure configs = [ "..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -58,7 +56,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources_pressure = [] sources += sources_pressure configs = [ "..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -74,6 +72,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) { sources += sources_full sources += sources_pressure configs = [ "..:public_config_for_pressure" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/fs/config.gni b/testsuites/unittest/fs/config.gni index a4b70375..f2f1e802 100644 --- a/testsuites/unittest/fs/config.gni +++ b/testsuites/unittest/fs/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ] diff --git a/testsuites/unittest/libc/io/BUILD.gn b/testsuites/unittest/libc/io/BUILD.gn index 6f2978f3..797aae93 100644 --- a/testsuites/unittest/libc/io/BUILD.gn +++ b/testsuites/unittest/libc/io/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/io/config.gni b/testsuites/unittest/libc/io/config.gni index 39508845..9d072a92 100644 --- a/testsuites/unittest/libc/io/config.gni +++ b/testsuites/unittest/libc/io/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/libc/misc/BUILD.gn b/testsuites/unittest/libc/misc/BUILD.gn index 9fc35599..77f0f298 100644 --- a/testsuites/unittest/libc/misc/BUILD.gn +++ b/testsuites/unittest/libc/misc/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/misc/config.gni b/testsuites/unittest/libc/misc/config.gni index 6fdbc335..0d34c95f 100644 --- a/testsuites/unittest/libc/misc/config.gni +++ b/testsuites/unittest/libc/misc/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/libc/posix/BUILD.gn b/testsuites/unittest/libc/posix/BUILD.gn index f75c7fca..571fce36 100644 --- a/testsuites/unittest/libc/posix/BUILD.gn +++ b/testsuites/unittest/libc/posix/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/posix/config.gni b/testsuites/unittest/libc/posix/config.gni index aa81379b..1d1a8adb 100644 --- a/testsuites/unittest/libc/posix/config.gni +++ b/testsuites/unittest/libc/posix/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/libc/sys/BUILD.gn b/testsuites/unittest/libc/sys/BUILD.gn index 0e4a3ec7..74a55c90 100644 --- a/testsuites/unittest/libc/sys/BUILD.gn +++ b/testsuites/unittest/libc/sys/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/sys/config.gni b/testsuites/unittest/libc/sys/config.gni index a1e14c9a..7dd898cc 100644 --- a/testsuites/unittest/libc/sys/config.gni +++ b/testsuites/unittest/libc/sys/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/libc/time/BUILD.gn b/testsuites/unittest/libc/time/BUILD.gn index bf77ffaa..6441afa8 100644 --- a/testsuites/unittest/libc/time/BUILD.gn +++ b/testsuites/unittest/libc/time/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/time/config.gni b/testsuites/unittest/libc/time/config.gni index d041fa9c..b413e23a 100644 --- a/testsuites/unittest/libc/time/config.gni +++ b/testsuites/unittest/libc/time/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/libc/util/BUILD.gn b/testsuites/unittest/libc/util/BUILD.gn index a820d67c..37ae169b 100644 --- a/testsuites/unittest/libc/util/BUILD.gn +++ b/testsuites/unittest/libc/util/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("libc_config") { @@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "../..:public_config_for_door" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "../..:public_config_for_all" ] configs += [ ":libc_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/libc/util/config.gni b/testsuites/unittest/libc/util/config.gni index c8880125..488c8079 100644 --- a/testsuites/unittest/libc/util/config.gni +++ b/testsuites/unittest/libc/util/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/net/BUILD.gn b/testsuites/unittest/net/BUILD.gn index d70558c0..b10c06f5 100644 --- a/testsuites/unittest/net/BUILD.gn +++ b/testsuites/unittest/net/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") config("net_config") { @@ -55,7 +53,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources += sources_full configs = [ "..:public_config_for_door" ] configs += [ ":net_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -69,6 +67,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_full configs = [ "..:public_config_for_all" ] configs += [ ":net_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/net/config.gni b/testsuites/unittest/net/config.gni index bf56719e..aaeafe7e 100644 --- a/testsuites/unittest/net/config.gni +++ b/testsuites/unittest/net/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ] diff --git a/testsuites/unittest/process/basic/process/BUILD.gn b/testsuites/unittest/process/basic/process/BUILD.gn index d7d0db4a..8519158c 100644 --- a/testsuites/unittest/process/basic/process/BUILD.gn +++ b/testsuites/unittest/process/basic/process/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "../../..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "../../..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/process/basic/process/config.gni b/testsuites/unittest/process/basic/process/config.gni index f28e4be0..f33462b0 100644 --- a/testsuites/unittest/process/basic/process/config.gni +++ b/testsuites/unittest/process/basic/process/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../../common/include", ] diff --git a/testsuites/unittest/process/basic/pthread/BUILD.gn b/testsuites/unittest/process/basic/pthread/BUILD.gn index 2baa4f7e..9db974c0 100644 --- a/testsuites/unittest/process/basic/pthread/BUILD.gn +++ b/testsuites/unittest/process/basic/pthread/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "../../..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "../../..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/process/basic/pthread/config.gni b/testsuites/unittest/process/basic/pthread/config.gni index 9906a630..fb15d289 100644 --- a/testsuites/unittest/process/basic/pthread/config.gni +++ b/testsuites/unittest/process/basic/pthread/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../../common/include", ] diff --git a/testsuites/unittest/process/fs/BUILD.gn b/testsuites/unittest/process/fs/BUILD.gn index fa74c551..02902a41 100644 --- a/testsuites/unittest/process/fs/BUILD.gn +++ b/testsuites/unittest/process/fs/BUILD.gn @@ -27,6 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") @@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "../..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +54,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "../..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/process/fs/config.gni b/testsuites/unittest/process/fs/config.gni index 5978495b..54c04390 100644 --- a/testsuites/unittest/process/fs/config.gni +++ b/testsuites/unittest/process/fs/config.gni @@ -30,7 +30,7 @@ import("//build/lite/config/test.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/process/lock/BUILD.gn b/testsuites/unittest/process/lock/BUILD.gn index 82ae8a95..e1d1fd24 100644 --- a/testsuites/unittest/process/lock/BUILD.gn +++ b/testsuites/unittest/process/lock/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "../..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "../..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/process/lock/config.gni b/testsuites/unittest/process/lock/config.gni index a1e270c2..550902fe 100644 --- a/testsuites/unittest/process/lock/config.gni +++ b/testsuites/unittest/process/lock/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/process/plimits/BUILD.gn b/testsuites/unittest/process/plimits/BUILD.gn index 0901b3f2..aff7786a 100644 --- a/testsuites/unittest/process/plimits/BUILD.gn +++ b/testsuites/unittest/process/plimits/BUILD.gn @@ -27,6 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") @@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "../..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +54,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "../..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/process/plimits/config.gni b/testsuites/unittest/process/plimits/config.gni index 35cbe4b1..cfb6d636 100644 --- a/testsuites/unittest/process/plimits/config.gni +++ b/testsuites/unittest/process/plimits/config.gni @@ -30,7 +30,7 @@ import("//build/lite/config/test.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../../common/include", ] diff --git a/testsuites/unittest/security/BUILD.gn b/testsuites/unittest/security/BUILD.gn index 0032da79..348066ee 100644 --- a/testsuites/unittest/security/BUILD.gn +++ b/testsuites/unittest/security/BUILD.gn @@ -26,8 +26,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/test.gni") -import("//kernel/liteos_a/testsuites/unittest/config.gni") import("./config.gni") if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { @@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { sources_full = [] sources += sources_full configs = [ "..:public_config_for_door" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } @@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { sources += sources_smoke sources += sources_full configs = [ "..:public_config_for_all" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ] } } diff --git a/testsuites/unittest/security/config.gni b/testsuites/unittest/security/config.gni index 75e411d9..2f82731e 100644 --- a/testsuites/unittest/security/config.gni +++ b/testsuites/unittest/security/config.gni @@ -27,10 +27,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/test.gni") +import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni") common_include_dirs = [ - "//third_party/googletest/googletest/include", + "$THIRDPARTY_GOOGLETEST_DIR/googletest/include", "../common/include", ]