未验证 提交 280769ae 编写于 作者: O openharmony_ci 提交者: Gitee

!1163 GN脚本规范化

Merge pull request !1163 from zhushengle/GN
...@@ -299,7 +299,7 @@ config("public") { ...@@ -299,7 +299,7 @@ config("public") {
configs += [ configs += [
"$HDFTOPDIR:public", "$HDFTOPDIR:public",
"//drivers/liteos:public", "$DRIVERS_LITEOS_DIR:public",
] ]
if (HAVE_DEVICE_SDK) { if (HAVE_DEVICE_SDK) {
...@@ -324,8 +324,8 @@ group("modules") { ...@@ -324,8 +324,8 @@ group("modules") {
] ]
deps += [ deps += [
"//drivers/liteos", "$DRIVERS_LITEOS_DIR",
HDFTOPDIR, "$HDFTOPDIR",
] ]
if (HAVE_DEVICE_SDK) { if (HAVE_DEVICE_SDK) {
...@@ -351,7 +351,7 @@ group("liteos_a") { ...@@ -351,7 +351,7 @@ group("liteos_a") {
deps += [ deps += [
":apps", ":apps",
":tests", ":tests",
"//third_party/musl/scripts/build_lite:strip", "$THIRDPARTY_MUSL_DIR/scripts/build_lite:strip",
] ]
if (liteos_skip_make == false) { if (liteos_skip_make == false) {
deps += [ ":make" ] deps += [ ":make" ]
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/component/lite_component.gni")
import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/liteos.gni")
import("//third_party/mksh/mksh.gni") import("$THIRDPARTY_MKSH_DIR/mksh.gni")
group("mksh") { group("mksh") {
deps = [ ":build_mksh" ] deps = [ ":build_mksh" ]
...@@ -42,7 +42,7 @@ copy("copy_mksh_src") { ...@@ -42,7 +42,7 @@ copy("copy_mksh_src") {
build_ext_component("build_mksh") { build_ext_component("build_mksh") {
deps = [ ":copy_mksh_src" ] 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") exec_path = rebase_path("$target_out_dir/mksh_build")
cflags = [ cflags = [
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/component/lite_component.gni")
import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/liteos.gni")
import("//third_party/toybox/toybox.gni") import("$THIRDPARTY_TOYBOX_DIR/toybox.gni")
group("toybox") { group("toybox") {
deps = [ ":build_toybox" ] deps = [ ":build_toybox" ]
...@@ -51,7 +51,7 @@ build_ext_component("build_toybox") { ...@@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
":copy_toybox_config", ":copy_toybox_config",
":copy_toybox_src", ":copy_toybox_src",
] ]
deps += [ "//third_party/musl:sysroot_lite" ] deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
exec_path = rebase_path("$target_out_dir/toybox_build") exec_path = rebase_path("$target_out_dir/toybox_build")
cflags = [ cflags = [
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_DRIVERS_VIDEO)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_FAT)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -31,7 +31,7 @@ import("//kernel/liteos_a/liteos.gni") ...@@ -31,7 +31,7 @@ import("//kernel/liteos_a/liteos.gni")
module_switch = defined(LOSCFG_FS_JFFS) module_switch = defined(LOSCFG_FS_JFFS)
module_name = get_path_info(rebase_path("."), "name") 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) out_path = rebase_path(target_out_dir)
kernel_module(module_name) { kernel_module(module_name) {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_NFS)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_RAMFS)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_ROMFS)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_FS_VFS)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -33,7 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_HILOG) ...@@ -33,7 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_HILOG)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) { kernel_module(module_name) {
sources = [ sources = [
"//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c", "$HIVIEWDFX_HILOG_LITE_DIR/frameworks/featured/hiview_log.c",
"los_hilog.c", "los_hilog.c",
] ]
...@@ -42,8 +42,8 @@ kernel_module(module_name) { ...@@ -42,8 +42,8 @@ kernel_module(module_name) {
config("public") { config("public") {
include_dirs = [ include_dirs = [
"//base/hiviewdfx/hilog_lite/interfaces/native/kits", "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits/hilog",
".", ".",
] ]
} }
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_KERNEL_PIPE)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,11 +28,8 @@ ...@@ -28,11 +28,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") import("//kernel/liteos_a/liteos.gni")
import("$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/musl.gni")
MUSLDIR = "$LITEOSTHIRDPARTY/musl" import("$THIRDPARTY_OPTIMIZED_ROUTINES_DIR/optimized-routines.gni")
import("//third_party/optimized-routines/optimized-routines.gni")
import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
module_switch = defined(LOSCFG_LIBC_MUSL) module_switch = defined(LOSCFG_LIBC_MUSL)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_LIBC_NEWLIB)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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") module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) { kernel_module(module_name) {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni") 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_switch = defined(LOSCFG_LIB_LIBC)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
......
...@@ -32,6 +32,19 @@ import("$root_out_dir/config.gni") ...@@ -32,6 +32,19 @@ import("$root_out_dir/config.gni")
LITEOSTOPDIR = "//kernel/liteos_a" LITEOSTOPDIR = "//kernel/liteos_a"
LITEOSTHIRDPARTY = "//third_party" LITEOSTHIRDPARTY = "//third_party"
HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos" 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 = "" ARCH = ""
if (defined(LOSCFG_ARCH_ARM_AARCH32)) { if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
...@@ -135,8 +148,8 @@ set_defaults("kernel_module") { ...@@ -135,8 +148,8 @@ set_defaults("kernel_module") {
"$LITEOSTOPDIR:los_config", "$LITEOSTOPDIR:los_config",
] ]
visibility = [ visibility = [
"$LITEOSTOPDIR:*",
":*", ":*",
"$LITEOSTOPDIR:*",
"..:*", "..:*",
"../..:*", "../..:*",
] ]
......
...@@ -45,8 +45,8 @@ config("liteos_kernel_test_public") { ...@@ -45,8 +45,8 @@ config("liteos_kernel_test_public") {
"$LITEOSTOPDIR/arch/arm/arm/include", "$LITEOSTOPDIR/arch/arm/arm/include",
"$LITEOSTOPDIR/arch/arm/include", "$LITEOSTOPDIR/arch/arm/include",
"$LITEOSTOPDIR/extended/include", "$LITEOSTOPDIR/extended/include",
"//third_party/musl/porting/liteos_a/kernel/include", "$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/include",
"//third_party/bounds_checking_function/include/", "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/include/",
"$LITEOSTOPDIR/lib/libscrew/include", "$LITEOSTOPDIR/lib/libscrew/include",
"$LITEOSTOPDIR/fs/vfs", "$LITEOSTOPDIR/fs/vfs",
"$LITEOSTOPDIR/fs/proc/include", "$LITEOSTOPDIR/fs/proc/include",
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
...@@ -69,7 +70,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -69,7 +70,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
"..:public_config_for_door", "..:public_config_for_door",
":container_config", ":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) { ...@@ -85,6 +86,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
"..:public_config_for_all", "..:public_config_for_all",
":container_config", ":container_config",
] ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
"$TEST_UNITTEST_DIR/container", "$TEST_UNITTEST_DIR/container",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -43,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -43,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_pressure = [] sources_pressure = []
sources += sources_pressure sources += sources_pressure
configs = [ "..:public_config_for_door" ] 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) { ...@@ -58,7 +56,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources_pressure = [] sources_pressure = []
sources += sources_pressure sources += sources_pressure
configs = [ "..:public_config_for_all" ] 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) { ...@@ -74,6 +72,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) {
sources += sources_full sources += sources_full
sources += sources_pressure sources += sources_pressure
configs = [ "..:public_config_for_pressure" ] configs = [ "..:public_config_for_pressure" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("libc_config") { config("libc_config") {
...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -49,7 +47,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] configs = [ "../..:public_config_for_door" ]
configs += [ ":libc_config" ] 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) { ...@@ -63,6 +61,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
configs += [ ":libc_config" ] configs += [ ":libc_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
config("net_config") { config("net_config") {
...@@ -55,7 +53,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -55,7 +53,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_door" ] configs = [ "..:public_config_for_door" ]
configs += [ ":net_config" ] 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) { ...@@ -69,6 +67,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
configs += [ ":net_config" ] configs += [ ":net_config" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "../../..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "../../..:public_config_for_all" ] configs = [ "../../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../../common/include", "../../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "../../..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "../../..:public_config_for_all" ] configs = [ "../../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../../common/include", "../../../common/include",
] ]
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
...@@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] 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) { ...@@ -53,6 +54,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -30,7 +30,7 @@ import("//build/lite/config/test.gni") ...@@ -30,7 +30,7 @@ import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
...@@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +41,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_door" ] 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) { ...@@ -53,6 +54,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -30,7 +30,7 @@ import("//build/lite/config/test.gni") ...@@ -30,7 +30,7 @@ import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../../common/include", "../../common/include",
] ]
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni")
import("./config.gni") import("./config.gni")
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { ...@@ -40,7 +38,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
sources_full = [] sources_full = []
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_door" ] 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) { ...@@ -53,6 +51,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
sources += sources_smoke sources += sources_smoke
sources += sources_full sources += sources_full
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
} }
} }
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("//kernel/liteos_a/liteos.gni")
import("//kernel/liteos_a/testsuites/unittest/config.gni") import("//kernel/liteos_a/testsuites/unittest/config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
"../common/include", "../common/include",
] ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册