!1165 【回合到OH-4.0-Beta1】调整TDD测试用例

Merge pull request !1165 from zhangdengyu/cherry-pick-1684917288

BUILD.gn

@@ -299,7 +299,7 @@ config("public") {
 
   configs += [
     "$HDFTOPDIR:public",
-    "$DRIVERS_LITEOS_DIR:public",
+    "//drivers/liteos:public",
   ]
 
   if (HAVE_DEVICE_SDK) {
@@ -324,8 +324,8 @@ group("modules") {
   ]
 
   deps += [
-    "$DRIVERS_LITEOS_DIR",
-    "$HDFTOPDIR",
+    "//drivers/liteos",
+    HDFTOPDIR,
   ]
 
   if (HAVE_DEVICE_SDK) {
@@ -351,7 +351,7 @@ group("liteos_a") {
     deps += [
       ":apps",
       ":tests",
-      "$THIRDPARTY_MUSL_DIR/scripts/build_lite:strip",
+      "//third_party/musl/scripts/build_lite:strip",
     ]
     if (liteos_skip_make == false) {
       deps += [ ":make" ]

apps/mksh/BUILD.gn

@@ -29,7 +29,7 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MKSH_DIR/mksh.gni")
+import("//third_party/mksh/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 += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
   exec_path = rebase_path("$target_out_dir/mksh_build")
 
   cflags = [

apps/toybox/BUILD.gn

@@ -29,7 +29,7 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_TOYBOX_DIR/toybox.gni")
+import("//third_party/toybox/toybox.gni")
 
 group("toybox") {
   deps = [ ":build_toybox" ]
@@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
     ":copy_toybox_config",
     ":copy_toybox_src",
   ]
-  deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
   exec_path = rebase_path("$target_out_dir/toybox_build")
 
   cflags = [

drivers/char/bch/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
 module_name = get_path_info(rebase_path("."), "name")

drivers/char/video/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_DRIVERS_VIDEO)
 module_name = get_path_info(rebase_path("."), "name")

fs/fat/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_FATFS_DIR/FatFs.gni")
+import("//third_party/FatFs/FatFs.gni")
 
 module_switch = defined(LOSCFG_FS_FAT)
 module_name = get_path_info(rebase_path("."), "name")

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_DIR")
+linux_path = rebase_path("//kernel/linux/linux-5.10")
 out_path = rebase_path(target_out_dir)
 
 kernel_module(module_name) {

fs/nfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_NFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/ramfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_RAMFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/romfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_ROMFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/vfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_VFS)
 module_name = get_path_info(rebase_path("."), "name")

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 = [
-    "$HIVIEWDFX_HILOG_LITE_DIR/frameworks/featured/hiview_log.c",
+    "//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c",
     "los_hilog.c",
   ]
 
@@ -42,8 +42,8 @@ kernel_module(module_name) {
 
 config("public") {
   include_dirs = [
-    "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits",
-    "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits/hilog",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog",
     ".",
   ]
 }

kernel/extended/pipes/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_KERNEL_PIPE)
 module_name = get_path_info(rebase_path("."), "name")

lib/libc/musl/BUILD.gn

@@ -28,8 +28,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/musl.gni")
-import("$THIRDPARTY_OPTIMIZED_ROUTINES_DIR/optimized-routines.gni")
+
+MUSLDIR = "$LITEOSTHIRDPARTY/musl"
+
+import("//third_party/optimized-routines/optimized-routines.gni")
+import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
 
 module_switch = defined(LOSCFG_LIBC_MUSL)
 module_name = get_path_info(rebase_path("."), "name")

lib/libc/newlib/BUILD.gn

@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MUSL_DIR/porting/liteos_a_newlib/kernel/newlib.gni")
+import("//third_party/musl/porting/liteos_a_newlib/kernel/newlib.gni")
 
 module_switch = defined(LOSCFG_LIBC_NEWLIB)
 module_name = get_path_info(rebase_path("."), "name")

lib/libscrew/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_FREEBSD_DIR/FreeBSD.gni")
+import("//third_party/FreeBSD/FreeBSD.gni")
 
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {

lib/libsec/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni")
+import("//third_party/bounds_checking_function/libsec_src.gni")
 
 module_switch = defined(LOSCFG_LIB_LIBC)
 module_name = get_path_info(rebase_path("."), "name")

liteos.gni

@@ -32,19 +32,6 @@ 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)) {
@@ -148,8 +135,8 @@ set_defaults("kernel_module") {
     "$LITEOSTOPDIR:los_config",
   ]
   visibility = [
-    ":*",
     "$LITEOSTOPDIR:*",
+    ":*",
     "..:*",
     "../..:*",
   ]

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",
-    "$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/include",
-    "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/include/",
+    "//third_party/musl/porting/liteos_a/kernel/include",
+    "//third_party/bounds_checking_function/include/",
     "$LITEOSTOPDIR/lib/libscrew/include",
     "$LITEOSTOPDIR/fs/vfs",
     "$LITEOSTOPDIR/fs/proc/include",

testsuites/unittest/basic/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/basic/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/container/BUILD.gn

@@ -27,7 +27,6 @@
 # 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")
 
@@ -70,7 +69,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
       "..:public_config_for_door",
       ":container_config",
     ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -86,6 +85,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
       "..:public_config_for_all",
       ":container_config",
     ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/container/config.gni

@@ -29,7 +29,7 @@
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "$TEST_UNITTEST_DIR/container",
 ]

testsuites/unittest/drivers/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/drivers/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/extended/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/extended/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/fs/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -41,7 +43,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_pressure = []
     sources += sources_pressure
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -56,7 +58,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources_pressure = []
     sources += sources_pressure
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -72,6 +74,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) {
     sources += sources_full
     sources += sources_pressure
     configs = [ "..:public_config_for_pressure" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/fs/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/libc/io/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/io/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/misc/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/misc/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/posix/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/posix/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/sys/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/sys/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/time/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/time/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/util/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/util/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/net/BUILD.gn

@@ -26,6 +26,8 @@
 # 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") {
@@ -53,7 +55,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
     configs += [ ":net_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -67,6 +69,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
     configs += [ ":net_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/net/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/process/basic/process/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/basic/process/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../../common/include",
 ]
 

testsuites/unittest/process/basic/pthread/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/basic/pthread/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../../common/include",
 ]
 

testsuites/unittest/process/fs/BUILD.gn

@@ -27,7 +27,6 @@
 # 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")
 
@@ -41,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -54,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/process/lock/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/lock/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/process/plimits/BUILD.gn

@@ -27,7 +27,6 @@
 # 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")
 
@@ -41,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -54,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/security/BUILD.gn

@@ -26,6 +26,8 @@
 # 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) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/security/config.gni

@@ -27,11 +27,10 @@
 # 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 = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]