Description:IPC绝对路径整改

Feature or Bugfix:IPC绝对路径整改
Binary Source: No

Signed-off-by: Yippo <liuyibo12@huawei.com>
This commit is contained in:
Yippo 2023-05-05 20:12:48 +08:00
parent c0e28bfe94
commit 1639a61726
31 changed files with 199 additions and 175 deletions

View File

@ -42,13 +42,13 @@ config("ipc_util_config") {
group("ipc_components") {
if (os_level == "standard") {
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"//foundation/communication/ipc/interfaces/innerkits/rust:rust_ipc_component",
"//foundation/communication/ipc/ipc/native/src/core:ipc_common",
"$IPC_CORE_ROOT/src/core:ipc_common",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/rust:rust_ipc_component",
]
} else {
deps = [ "//foundation/communication/ipc/interfaces/innerkits/c:rpc" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c:rpc" ]
}
}

View File

@ -1,6 +1,6 @@
{
"name": "@openharmony/ipc",
"version": "3.1.0",
"version": "4.0",
"description": "ipc",
"publishAs": "code-segment",
"scripts": {

View File

@ -12,7 +12,9 @@
# limitations under the License.
import("//build/lite/config/component/lite_component.gni")
import("//foundation/communication/ipc/config.gni")
import("../../../ipc/config.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc/ipc"
declare_args() {
enable_ipc_test = false
@ -32,9 +34,9 @@ lite_component("rpc") {
if (enable_ipc_test == true) {
features += [
"//foundation/communication/ipc/ipc/test/ipc:ipc_test",
"//foundation/communication/ipc/ipc/test/unittest/ipc:ipc_test_gtest",
"//foundation/communication/ipc/ipc/test/unittest/rpc:rpc_test_gtest",
"$SUBSYSTEM_DIR/test/ipc:ipc_test",
"$SUBSYSTEM_DIR/test/unittest/ipc:ipc_test_gtest",
"$SUBSYSTEM_DIR/test/unittest/rpc:rpc_test_gtest",
]
}
}

View File

@ -15,6 +15,7 @@ import("//build/lite/config/component/lite_component.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
DBINDER_ROOT = "$SUBSYSTEM_DIR/services/dbinder/c"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
config("ipc_rpc_interface") {
include_dirs = [
@ -80,6 +81,6 @@ if (ohos_kernel_type == "linux") {
"//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
]
ldflags = [ "-lpthread" ]
deps = [ "//foundation/communication/ipc/ipc/native/c/adapter:rpc_adapter" ]
deps = [ "$IPC_CORE_ROOT/c/adapter:rpc_adapter" ]
}
}

View File

@ -75,8 +75,8 @@ if (ohos_kernel_type == "liteos_m") {
"$SUBSYSTEM_DIR/utils/include",
]
deps = [
"$IPC_CORE_ROOT/adapter:rpc_adapter",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//foundation/communication/ipc/ipc/native/c/adapter:rpc_adapter",
"//kernel/liteos_m/components/net",
]
defines = [ "RPC_SOFTBUS_TRANS" ]
@ -128,7 +128,7 @@ if (ohos_kernel_type == "liteos_m") {
cflags_cc = cflags
public_deps = [
":rpc_log",
"//foundation/communication/ipc/ipc/native/c/adapter:rpc_adapter",
"$IPC_CORE_ROOT/adapter:rpc_adapter",
"//third_party/bounds_checking_function/:libsec_shared",
]
}
@ -215,7 +215,7 @@ if (ohos_kernel_type == "liteos_m") {
cflags_cc = cflags
public_deps = [
":rpc_log",
"//foundation/communication/ipc/ipc/native/c/adapter:rpc_adapter",
"$IPC_CORE_ROOT/adapter:rpc_adapter",
"//third_party/bounds_checking_function/:libsec_shared",
]
deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ]

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("GetFeatureSizeFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/getfeaturesize_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/getfeaturesize_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -33,9 +35,9 @@ ohos_fuzztest("GetFeatureSizeFuzzTest") {
sources = [ "getfeaturesize_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("GetRpcFeatureAckFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/getrpcfeatureack_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/getrpcfeatureack_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -34,9 +36,9 @@ ohos_fuzztest("GetRpcFeatureAckFuzzTest") {
sources = [ "getrpcfeatureack_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("GetTokenFromDataFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/gettokenfromdata_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/gettokenfromdata_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -33,9 +35,9 @@ ohos_fuzztest("GetTokenFromDataFuzzTest") {
sources = [ "gettokenfromdata_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("GetTokenIdSizeFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/gettokenidsize_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/gettokenidsize_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -34,9 +36,9 @@ ohos_fuzztest("GetTokenIdSizeFuzzTest") {
sources = [ "gettokenidsize_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("IsATEnableFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/isatenable_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/isatenable_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -33,9 +35,9 @@ ohos_fuzztest("IsATEnableFuzzTest") {
sources = [ "isatenable_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("IsFeatureAckFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/isfeatureack_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/isfeatureack_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -34,9 +36,9 @@ ohos_fuzztest("IsFeatureAckFuzzTest") {
sources = [ "isfeatureack_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("SetFeatureTransDataFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/c/setfeaturetransdata_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/c/setfeaturetransdata_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -34,9 +36,9 @@ ohos_fuzztest("SetFeatureTransDataFuzzTest") {
sources = [ "setfeaturetransdata_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,15 +14,17 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("BufferObjectFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/core/bufferobject_fuzzer"
fuzz_config_file = "$IPC_CORE_ROOT/test/fuzztest/core/bufferobject_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/src/core/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/src/core/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
cflags = [
"-g",
@ -34,9 +36,9 @@ ohos_fuzztest("BufferObjectFuzzTest") {
sources = [ "bufferobject_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,18 +14,21 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
##############################fuzztest##########################################
ohos_fuzztest("DBinderDatabusInvokerFuzzTest") {
module_out_path = "ipc/native"
fuzz_config_file = "//foundation/communication/ipc/ipc/native/test/fuzztest/mock/dbinderdatabusinvoker_fuzzer"
fuzz_config_file =
"$IPC_CORE_ROOT/test/fuzztest/mock/dbinderdatabusinvoker_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/utils/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/src/core/include",
"//foundation/communication/ipc/ipc/native/src/mock/include",
"$SUBSYSTEM_DIR/utils/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/src/core/include",
"$IPC_CORE_ROOT/src/mock/include",
]
cflags = [
"-g",
@ -37,9 +40,9 @@ ohos_fuzztest("DBinderDatabusInvokerFuzzTest") {
sources = [ "dbinderdatabusinvoker_fuzzer.cpp" ]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder:libdbinder",
]
external_deps = [

View File

@ -14,7 +14,8 @@
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_TEST_ROOT = "//foundation/communication/ipc/ipc/test"
IPC_TEST_ROOT = "$SUBSYSTEM_DIR/ipc/test"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
MODULE_OUTPUT_PATH = "ipc"
ohos_unittest("IPCNativeUnitTest") {
@ -23,11 +24,11 @@ ohos_unittest("IPCNativeUnitTest") {
include_dirs = [
"//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/c/ipc_adapter/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"//foundation/communication/ipc/native/src/core/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/c/ipc_adapter/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/native/src/core/include",
]
sources = [
@ -64,8 +65,7 @@ ohos_unittest("IPCNativeUnitTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("IPCFileDescOpsTest") {
@ -73,11 +73,11 @@ ohos_unittest("IPCFileDescOpsTest") {
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/c/ipc_adapter/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"//foundation/communication/ipc/native/src/core/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/c/ipc_adapter/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/native/src/core/include",
]
sources = [ "ipc_file_desc_unittest.cpp" ]
@ -99,8 +99,7 @@ ohos_unittest("IPCFileDescOpsTest") {
"ipc:ipc_core",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("BinderConnectorTest") {
@ -127,8 +126,7 @@ ohos_unittest("BinderConnectorTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("BinderInvokerUnitTest") {
@ -136,8 +134,8 @@ ohos_unittest("BinderInvokerUnitTest") {
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/ipc/native/c/adapter/access_token/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$IPC_CORE_ROOT/c/adapter/access_token/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
sources = [ "binder_invoker_unittest.cpp" ]
@ -160,8 +158,7 @@ ohos_unittest("BinderInvokerUnitTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("IPCHiTraceUnitTest") {
@ -190,8 +187,7 @@ ohos_unittest("IPCHiTraceUnitTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
if (support_jsapi) {
@ -199,7 +195,7 @@ if (support_jsapi) {
module_out_path = MODULE_OUTPUT_PATH
include_dirs = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"//foundation/arkui/napi/interfaces/kits",
]
@ -217,8 +213,7 @@ if (support_jsapi) {
"ipc:ipc_napi_common",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
}
@ -228,10 +223,10 @@ ohos_unittest("IPCMockUnitTest") {
include_dirs = [
"//utils/system/safwk/native/include",
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/ipc/native/src/mock/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/c/adapter/access_token/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$IPC_CORE_ROOT/src/mock/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/c/adapter/access_token/include",
]
sources = [ "ipc_binder_databus_invoker_unittest.cpp" ]
@ -255,8 +250,7 @@ ohos_unittest("IPCMockUnitTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("InvokerFactoryTest") {
@ -265,10 +259,10 @@ ohos_unittest("InvokerFactoryTest") {
include_dirs = [
"//utils/system/safwk/native/include",
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/ipc/native/src/mock/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/c/adapter/access_token/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$IPC_CORE_ROOT/src/mock/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/c/adapter/access_token/include",
]
sources = [ "invoker_factory_unittest.cpp" ]
@ -292,8 +286,7 @@ ohos_unittest("InvokerFactoryTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("RPCFeatureUnitTest") {
@ -302,11 +295,11 @@ ohos_unittest("RPCFeatureUnitTest") {
include_dirs = [
"//utils/system/safwk/native/include",
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/ipc/native/src/mock/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"//foundation/communication/ipc/ipc/native/c/adapter/access_token/include",
"//foundation/communication/ipc/ipc/native/c/rpc/src/",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$IPC_CORE_ROOT/src/mock/include",
"$IPC_CORE_ROOT/c/rpc/include",
"$IPC_CORE_ROOT/c/adapter/access_token/include",
"$IPC_CORE_ROOT/c/rpc/src/",
]
sources = [ "rpc_feature_set_unittest.cpp" ]
@ -330,8 +323,7 @@ ohos_unittest("RPCFeatureUnitTest") {
"samgr:samgr_proxy",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("IPCCInterfaceUnitTest") {
@ -339,8 +331,8 @@ ohos_unittest("IPCCInterfaceUnitTest") {
include_dirs = [
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/ipc/native/src/c_wrapper/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$IPC_CORE_ROOT/src/c_wrapper/include",
]
sources = [
@ -355,17 +347,16 @@ ohos_unittest("IPCCInterfaceUnitTest") {
]
deps = [
"$SUBSYSTEM_DIR/interfaces/innerkits/rust:ipc_c",
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//foundation/communication/ipc/interfaces/innerkits/rust:ipc_c",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
external_deps = [ "c_utils:utils" ]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
ohos_unittest("IPCSoDlcloseTest") {
@ -378,8 +369,7 @@ ohos_unittest("IPCSoDlcloseTest") {
"//third_party/googletest:gtest_main",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
###############################################################################

View File

@ -14,18 +14,17 @@
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
MODULE_OUTPUT_PATH = "ipc"
MODULE_OUTPUT_PATH = "$SUBSYSTEM_DIR/ipc"
ohos_rust_unittest("rust_ipc_test_client") {
module_out_path = MODULE_OUTPUT_PATH
sources = [ "src/main.rs" ]
deps = [
"$MODULE_OUTPUT_PATH/native/test/unittest/rust/service:test_ipc_service",
"$SUBSYSTEM_DIR/interfaces/innerkits/rust:ipc_rust",
"$SUBSYSTEM_DIR/ipc/native/test/unittest/rust/service:test_ipc_service",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
subsystem_name = "communication"
part_name = "ipc"

View File

@ -33,7 +33,7 @@ executable("ipc_test_client") {
]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
]

View File

@ -13,28 +13,28 @@
import("//build/lite/config/component/lite_component.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc/ipc/test"
IPC_CORE_ROOT = "//foundation/communication/ipc/ipc/native/c"
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_TEST_CORE = "$SUBSYSTEM_DIR/ipc/test"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native/c"
executable("samgr") {
output_extension = "bin"
output_dir = "$root_out_dir/test/ipc"
sources = [ "$SUBSYSTEM_DIR/ipc/samgr/samgr.c" ]
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",
"//foundation/communication/ipc/services/dbinder/c/include",
"$SUBSYSTEM_DIR/services/dbinder/c/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/innerkits",
"$SUBSYSTEM_DIR/ipc/include",
"$IPC_TEST_CORE/ipc/include",
]
ldflags = [
"-lstdc++",
"-lpthread",
]
deps =
[ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
configs -= [ "//build/lite/config:clang_opt" ]
}

View File

@ -13,19 +13,20 @@
import("//build/lite/config/component/lite_component.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc/ipc/test"
IPC_CORE_ROOT = "//foundation/communication/ipc/ipc/native/c"
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native/c"
IPC_TEST_CORE = "$SUBSYSTEM_DIR/ipc/test"
executable("ipc_test_server") {
output_extension = "bin"
output_dir = "$root_out_dir/test/ipc"
sources = [ "$SUBSYSTEM_DIR/ipc/server/ipc_test_server.c" ]
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",
"$SUBSYSTEM_DIR/ipc/include",
"$IPC_TEST_CORE/ipc/include",
]
ldflags = [
"-lstdc++",
@ -33,7 +34,7 @@ executable("ipc_test_server") {
]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
]

View File

@ -12,17 +12,20 @@
# limitations under the License.
import("//test/xts/tools/lite/build/suite_lite.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native/c"
IPC_TEST_CORE = "$SUBSYSTEM_DIR/ipc/test"
if (ohos_kernel_type == "linux") {
hcpptest_suite("SerializerTest") {
suite_name = "acts"
sources = [ "utils_serializer_test.cpp" ]
defines = [ "XTS_SUITE_TEST" ]
include_dirs = [
"//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
"//foundation/communication/ipc/ipc/native/c/manager/include",
]
deps = [
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"$IPC_TEST_CORE/interfaces/innerkits/c/ipc/include",
"$IPC_CORE_ROOT/manager/include",
]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
}
}

View File

@ -35,6 +35,5 @@ unittest("samgr") {
sources = [ "IpcSamgrTest.cpp" ]
deps =
[ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
}

View File

@ -14,8 +14,9 @@
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/config/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc/ipc/test/unittest/ipc"
IPC_CORE_ROOT = "//foundation/communication/ipc/ipc/native/c"
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_TEST_CORE = "$SUBSYSTEM_DIR/ipc/test/unittest/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native/c"
unittest("ipc_server") {
output_extension = "bin"
@ -26,7 +27,7 @@ unittest("ipc_server") {
]
include_dirs = [
"$SUBSYSTEM_DIR/include",
"$IPC_TEST_CORE/include",
"//third_party/bounds_checking_function/include",
"//commonlibrary/utils_lite/include",
"$IPC_CORE_ROOT/manager/include",
@ -35,6 +36,5 @@ unittest("ipc_server") {
sources = [ "IpcServerTest.cpp" ]
deps =
[ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c/ipc:ipc_single" ]
}

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
DBINDER_TEST_ROOT = "//foundation/communication/ipc/services/dbinder/test"
DBINDER_TEST_ROOT = "$SUBSYSTEM_DIR/services/dbinder/test"
MODULE_OUTPUT_PATH = "ipc/services/dbinder"
###############################################################################
@ -62,8 +62,7 @@ ohos_distributedtest("DbinderTest") {
]
subsystem_name = "communication"
resource_config_file =
"//foundation/communication/ipc/test/resource/services/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/services/ohos_test.xml"
}
ohos_distributedtest("DbinderTestAgent") {
@ -93,8 +92,7 @@ ohos_distributedtest("DbinderTestAgent") {
]
subsystem_name = "communication"
resource_config_file =
"//foundation/communication/ipc/test/resource/services/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/services/ohos_test.xml"
}
###############################################################################

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("CloseDatabusSessionFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/closedatabussession_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/closedatabussession_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
]
cflags = [
"-g",

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("DBinderServiceFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/dbinderservice_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/dbinderservice_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
]
cflags = [
"-g",

View File

@ -14,15 +14,17 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("DetachProxyObjectFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/detachproxyobject_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/detachproxyobject_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
]
cflags = [
"-g",

View File

@ -14,15 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("LoadSystemAbilityCompleteFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/loadsystemabilitycomplete_fuzzer"
fuzz_config_file = "$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/loadsystemabilitycomplete_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
]
cflags = [
"-g",

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("NoticeDeviceDieFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/noticedevicedie_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/noticedevicedie_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
"//interfaces/innerkits/libdbinder/include",
]
cflags = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("NoticeServiceDieFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/noticeservicedie_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/noticeservicedie_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
"//interfaces/innerkits/libdbinder/include",
]
cflags = [

View File

@ -14,14 +14,16 @@
#####################hydra-fuzz###################
import("//build/config/features.gni")
import("//build/test.gni")
SUBSYSTEM_DIR = "//foundation/communication/ipc"
##############################fuzztest##########################################
ohos_fuzztest("SendDataToRemoteFuzzTest") {
module_out_path = "ipc/service"
fuzz_config_file = "//foundation/communication/ipc/services/dbinder/test/fuzztest/senddatatoremote_fuzzer"
fuzz_config_file =
"$SUBSYSTEM_DIR/services/dbinder/test/fuzztest/senddatatoremote_fuzzer"
include_dirs = [
"//utils/system/safwk/native/include",
"//foundation/communication/ipc/interfaces/innerkits/libdbinder/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include",
]
cflags = [
"-g",

View File

@ -13,19 +13,19 @@
import("//build/test.gni")
# SUBSYSTEM_DIR = "//foundation/communication/ipc"
# IPC_TEST_ROOT = "//foundation/communication/ipc/ipc/test"
SUBSYSTEM_DIR = "//foundation/communication/ipc"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
MODULE_OUTPUT_PATH = "ipc"
ohos_unittest("RPCDbinderTest") {
module_out_path = MODULE_OUTPUT_PATH
include_dirs = [
"//foundation/communication/ipc/ipc/native/c/manager/include",
"//foundation/communication/ipc/utils/include",
"$IPC_CORE_ROOT/c/manager/include",
"$SUBSYSTEM_DIR/utils/include",
"//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/communication/ipc/ipc/native/c/rpc/include",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include",
"$IPC_CORE_ROOT/c/rpc/include",
]
sources = [
@ -38,7 +38,7 @@ ohos_unittest("RPCDbinderTest") {
configs = []
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core:ipc_core",
"//third_party/googletest:gtest_main",
]
@ -49,8 +49,7 @@ ohos_unittest("RPCDbinderTest") {
"ipc:libdbinder",
]
resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
resource_config_file = "$SUBSYSTEM_DIR/test/resource/ipc/ohos_test.xml"
}
###############################################################################