!1457 gn代码整改

Merge pull request !1457 from weimengxue/master
This commit is contained in:
openharmony_ci 2024-10-21 02:44:22 +00:00 committed by Gitee
commit 10bb55c710
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 10 additions and 17 deletions

View File

@ -43,7 +43,6 @@ if (ohos_kernel_type == "linux") {
"$SUBSYSTEM_DIR/ipc/native/c/rpc/trans_adapter/include",
"$SUBSYSTEM_DIR/ipc/native/c/manager/include",
"$SUBSYSTEM_DIR/utils/include",
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
]
ldflags = [
@ -54,6 +53,7 @@ if (ohos_kernel_type == "linux") {
"$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:rpc_log",
"//third_party/bounds_checking_function/:libsec_shared",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}
} else if (ohos_kernel_type == "liteos_m") {
SYSTEM_LEVEL = "mini"

View File

@ -21,7 +21,6 @@ executable("ipc_test_client") {
output_dir = "$root_out_dir/test/ipc"
sources = [ "$SUBSYSTEM_DIR/ipc/client/ipc_test_client.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/innerkits",
@ -36,6 +35,7 @@ executable("ipc_test_client") {
"$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -22,7 +22,6 @@ executable("samgr") {
output_dir = "$root_out_dir/test/ipc"
sources = [ "$IPC_TEST_CORE/ipc/samgr/samgr.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/ipc/include",
@ -35,6 +34,7 @@ executable("samgr") {
"-lpthread",
]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -22,7 +22,6 @@ executable("ipc_test_server") {
output_dir = "$root_out_dir/test/ipc"
sources = [ "$IPC_TEST_CORE/ipc/server/ipc_test_server.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/innerkits",
@ -37,6 +36,7 @@ executable("ipc_test_server") {
"$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -19,7 +19,6 @@ IPC_CORE_ROOT = "${SUBSYSTEM_DIR}/ipc/native/c"
executable("rpc_client") {
sources = [ "$SUBSYSTEM_DIR/ipc/test/rpc/client/rpc_client.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/rpc/trans_adapter/include",
@ -37,6 +36,6 @@ executable("rpc_client") {
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/dbinder:dbinder",
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/ipc:rpc_manager",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -19,7 +19,6 @@ IPC_CORE_ROOT = "${SUBSYSTEM_DIR}/ipc/native/c"
executable("rpc_samgr") {
sources = [ "$SUBSYSTEM_DIR/ipc/test/rpc/samgr/rpc_samgr.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/ipc/include",
@ -38,6 +37,6 @@ executable("rpc_samgr") {
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/dbinder:dbinder",
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/ipc:rpc_manager",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -19,7 +19,6 @@ IPC_CORE_ROOT = "${SUBSYSTEM_DIR}/ipc/native/c"
executable("rpc_server") {
sources = [ "$SUBSYSTEM_DIR/ipc/test/rpc/server/rpc_server.c" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/ipc/include",
"$IPC_CORE_ROOT/manager/include",
@ -37,6 +36,6 @@ executable("rpc_server") {
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/dbinder:dbinder",
"${SUBSYSTEM_DIR}/interfaces/innerkits/c/ipc:rpc_manager",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -28,7 +28,6 @@ unittest("ipc_client") {
include_dirs = [
"$SUBSYSTEM_DIR/include",
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/ipc/include",
@ -38,4 +37,5 @@ unittest("ipc_client") {
deps =
[ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}

View File

@ -27,7 +27,6 @@ unittest("samgr") {
include_dirs = [
"$SUBSYSTEM_DIR/include",
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/ipc/include",
@ -36,4 +35,5 @@ unittest("samgr") {
sources = [ "IpcSamgrTest.cpp" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}

View File

@ -28,7 +28,6 @@ unittest("ipc_server") {
include_dirs = [
"$IPC_TEST_CORE/include",
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
"$IPC_CORE_ROOT/ipc/include",
@ -37,4 +36,5 @@ unittest("ipc_server") {
sources = [ "IpcServerTest.cpp" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}

View File

@ -50,7 +50,6 @@ ohos_distributedtest("DbinderTest") {
":dbinder_send",
":dbinder_test",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
"//third_party/googletest:gtest_main",
]
external_deps = [

View File

@ -34,8 +34,6 @@ ohos_moduletest("RPCCLIENTTEST") {
"$SUBSYSTEM_DIR/config:ipc_util_config",
]
deps = [ "//third_party/googletest:gtest_main" ]
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
@ -54,7 +52,6 @@ ohos_moduletest("RPCSERVERTEST") {
"src/rpc_test.cpp",
]
configs = [ "$SUBSYSTEM_DIR/config:ipc_util_config" ]
deps = [ "//third_party/googletest:gtest_main" ]
external_deps = [
"c_utils:utils",