diff --git a/BUILD.gn b/BUILD.gn index 4faac14f9d3fb86915a71904d73a4591d7a6abbb..4ba2c2ff65ce0a2a5b258b97952027a0478bad5b 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 5ae7088746a8b76e4eb9039b78888377c0edcbde..2e9c46d64083a4f9fbbdcca5708b8fb5d63054c4 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 61e765ae9015fd79a1a340f4ebe6b91e5b24ab27..e347c3722a5dfc33f9b52f2c62e65326a01b2052 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 634b1e7cbf511756f86a48b8ce9698db9b6b56af..16f292130ed7bd93d699a9c3ddc11dc2bdb293e6 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 a7fcc3f9c3edab488742de0bdb3349e3de80452b..b63955697703b94daec2c766bf1bb48cce866a73 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 921f9ea69148e2551bf31628451a9ba414439983..d87d32e1bf348fae01480ada2894420b25a072f5 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 dea3bd7c377076cb91ba80762b16dadd2c24e493..c184f753bfb90a845529f0a6aa2d33462ef5bea6 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 4a5c8cf4d24c544f5c0c94b3136f7556c1aa077b..c48f95eb4a83b6f3b4f25209d6d21fb928a7629f 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 716f4c3a0b60d5ca7a619cb019d4447edcf2350c..1f95d11ce2045d1341cc686a1395bb561977c060 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 4e371f7d9a3f75629cd251f8633760db20c68718..e01fc43b6a957fb6d8615a49eb3e303060c66b4c 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 d5b1d53dfa62f2d2513585e8ae209a0dd8b8d91c..96c181d146327f10dae2aeb177415262d1f5c81f 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 b925ff76c52cdc1d8772a5585ffc2ebcebe41bb1..857a3c3c66baa04dba1b7b6f9eacc4e8782fc4d4 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 5d589735782c7a9f9b97f97786df0b2d2416e716..c70cf4df6b8116f3cbccc81dfb653f44dd8089f6 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 df8b3507088a5bf6fce7fc575c46cd154ac43829..0fdde2b38512b3d8d203e28553c579e891f9a34e 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 f78432c4d3c1d247d7b7de276d43273e4cceee6e..7560d4fcb2979c7345cb1c67e1d0ecb561fd5435 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 e3cb2647de7db6cf65cab6c9786bc2ebcf1243ca..691915b04ca7ee86649396b016d5b5637938dbe8 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 ae17c1780364933893fadb7eba27ebf5b056a029..523cb219593cb3687903e4311567e2ab97ba094b 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 5ec817f41287c45ebded234e090dec054f02a577..6deef9944b254ecba4435868f7bd526a61bad1cd 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 47987d1f3f91ecdc61a0f4376ae38544b60824db..79cc074e0f6417db255f07df24e2827714d4ef1d 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 19b381fd0ffaaa6f7197cb873d7323363d7b48ef..bf8ff3e5395b7683f7e78b76feeef12b0c64f4de 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 4b18bbde88d73bd6420951c69fb381236c7d88f4..8f372411d521f2b0500285c150ae5ec80a8dd360 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 9fe3d4011334bd177e7ebb4c7dbc8e7b534d048c..bc53409aeca4498467b743283603bfb90956dd32 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 b5f407500e19a30c83ab22e3421479d9d4ee0bb6..35c55da972b95d9994f49567e77861ac064ae379 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 bcd19c536fff6c4b969412b08fc45efd0ba2fc71..eb3d7c4f9ed4e4bac918bfb58f5acc8ab1def2b8 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 53a75c7518503bdf4d0624fe22f75f01cc4c99b0..161d42fec8efabbaba0a0a13ae40f1909d0682db 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 a218fdeadd700d10e51101054b39236d1af1d2c0..f57067ae0859ed97111e6722b3abc4aa0400b36f 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 710c975f515b68c2517a7e0118ec776a986c50b0..3a341b6295ed21588a2e2b33712299b57438411e 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 43934be5df248847581323238ddc3643f0ac7273..1b108871ee0e909ea623b1ac3785765c79925d43 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 a4b7037529b97813e5ed3ab46675c1f99111ab9d..f2f1e80246753d00082734b762350770ed2f6a02 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 6f2978f3f0bb9cb6c814ec00ad7e30f4fb273533..797aae9382620b4eb19c6c8f6af3b4bfd88f000c 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 39508845529d0c3bc6eb2f1fe4d8f089add7aea5..9d072a924b074e461abb7119b8ade59c7b4586ac 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 9fc35599f34e4209edf1e3ef53ca5cf30384b887..77f0f2987a3cbf0d5f20450b783fb607946dda36 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 6fdbc335b6b60a54b9a82d3ac4cc773040a7bb1f..0d34c95f2f01f6126faf87d95ffa0f1d2e14a562 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 f75c7fca724eeefce97f4f2545455beb99d650d4..571fce36364c866cb3082256868b8f7afc1c88ad 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 aa81379baad00f364c45ff964f8c8c4898afbb39..1d1a8adba340f27d7c42aee78d0eae46e4ec4a61 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 0e4a3ec780ebb32d38704e62686fbb37e3f99d9a..74a55c90757e2d9240107fa62824af3f283be1e3 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 a1e14c9ab15076dd6a17ea5912868d2e1fb26ac2..7dd898cc8bdc489c7c3198e33c23f5922e97cc81 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 bf77ffaa3efabcc38c8271314208b48be1266f61..6441afa8bfef9c06d642c26873d30cc63b9bdb54 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 d041fa9c0ed82f589a8071f8998bb28134ac74e8..b413e23a7639c871f81df8714106142299e5538f 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 a820d67c2a9e343a3fb81057618baaba739b40e2..37ae169bac944f92baa45e00356c1890c0d4d664 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 c8880125ac887ce66737ec58b5c7ec999d3d26ee..488c807936822edbd7fa47c5579e43cb28a7d819 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 d70558c0c90b7469c04943f1720f7847a8f56a6f..b10c06f594c14b363a90f6808a8f616773dae079 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 bf56719ecf265fbbe96a219cec637309e7a59b29..aaeafe7ea4f627b49d388e4e3ab650f1147e5dcc 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 d7d0db4a7f704f25b36595b449a5176e27cb74e8..8519158c1450c4be20569b4fe32a5b4a8176db8f 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 f28e4be02babead74017d1c1db3947133787930c..f33462b0cbb765a2e0ccf2530122b6baf21ba53f 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 2baa4f7ee5d2e9ff0f7c6e6ce673d05a8336204e..9db974c095dea4fae766c8995d304ccf84558e39 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 9906a63073effbd1c0690cd1c728620b96431ee2..fb15d28903b0b6571d96407ccd344f93ba4d0078 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 fa74c5510ab1f95b8e55cdaea1ade337a022cea0..02902a416f9e939cb6354b3cbcc6b47bb3ef3f09 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 5978495be64aeb58a1b569466693204d34e0b46b..54c0439087923918a3562d7bd529f512cbba9886 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 82ae8a953599f871a9b6b1a8c8cc645fdb31fdae..e1d1fd244feb430338bb96f23bc60487a8cd9293 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 a1e270c27850113ceec157f28364371aafd38fae..550902fe83ea8779efccb1a8aa8815ed59bb8dbe 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 0901b3f2078d6c87bcd864051882cd39602040ed..aff7786a47067b72e7a977d0b5748d8b6f4b8110 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 35cbe4b14e7cc9226f58b45fd768d9323ddc293f..cfb6d6367f9d14f8f0318d158cb919c02acc3fa0 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 0032da79b90d45151729f37d94dad99bc4ca6624..348066eebe63436fb1faef86b23bb1058bcd216b 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 75e411d9a80b4f80bb1e93d44576d6bae1ab45c0..2f82731e8debce6bdc053887dccd120fdb8bc93d 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", ]