提交 1cdfa196 编写于 作者: O openharmony_ci 提交者: Gitee

!38 samgr part name rectify

Merge pull request !38 from zmx/master-dev
...@@ -56,7 +56,7 @@ ohos_shared_library("libdbinder") { ...@@ -56,7 +56,7 @@ ohos_shared_library("libdbinder") {
external_deps = [ external_deps = [
"dsoftbus_standard:softbus_client", "dsoftbus_standard:softbus_client",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "samgr_standard:samgr_proxy",
] ]
subsystem_name = "communication" subsystem_name = "communication"
part_name = "ipc" part_name = "ipc"
......
...@@ -89,7 +89,7 @@ ohos_shared_library("rpc") { ...@@ -89,7 +89,7 @@ ohos_shared_library("rpc") {
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core", "ipc:ipc_core",
"safwk:system_ability_fwk", "safwk:system_ability_fwk",
"samgr_L2:samgr_proxy", "samgr_standard:samgr_proxy",
] ]
relative_install_dir = "module" relative_install_dir = "module"
......
...@@ -36,11 +36,11 @@ ohos_unittest("IPCNativeUnitTest") { ...@@ -36,11 +36,11 @@ ohos_unittest("IPCNativeUnitTest") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
resource_config_file = resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml" "//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
} }
...@@ -61,10 +61,10 @@ ohos_unittest("IPCFileDescOpsTest") { ...@@ -61,10 +61,10 @@ ohos_unittest("IPCFileDescOpsTest") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
] ]
resource_config_file = resource_config_file =
"//foundation/communication/ipc/test/resource/ipc/ohos_test.xml" "//foundation/communication/ipc/test/resource/ipc/ohos_test.xml"
} }
...@@ -75,7 +75,7 @@ group("unittest") { ...@@ -75,7 +75,7 @@ group("unittest") {
deps = [ deps = [
":IPCFileDescOpsTest", ":IPCFileDescOpsTest",
":IPCNativeUnitTest", ":IPCNativeUnitTest",
] ]
} }
############################################################################### ###############################################################################
......
...@@ -35,9 +35,9 @@ ohos_shared_library("ipc_test_helper") { ...@@ -35,9 +35,9 @@ ohos_shared_library("ipc_test_helper") {
deps = [ "//utils/native/base:utils" ] deps = [ "//utils/native/base:utils" ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
...@@ -58,9 +58,9 @@ ohos_executable("ipc_server_test") { ...@@ -58,9 +58,9 @@ ohos_executable("ipc_server_test") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
...@@ -81,9 +81,9 @@ ohos_executable("ipc_client_test") { ...@@ -81,9 +81,9 @@ ohos_executable("ipc_client_test") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
...@@ -112,9 +112,9 @@ ohos_shared_library("ipc_test_helper_extra") { ...@@ -112,9 +112,9 @@ ohos_shared_library("ipc_test_helper_extra") {
deps = [ "//utils/native/base:utils" ] deps = [ "//utils/native/base:utils" ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
...@@ -135,9 +135,9 @@ ohos_executable("ipc_server_test_extra") { ...@@ -135,9 +135,9 @@ ohos_executable("ipc_server_test_extra") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
......
...@@ -32,9 +32,9 @@ ohos_moduletest("IPCNativeFrameworksTest") { ...@@ -32,9 +32,9 @@ ohos_moduletest("IPCNativeFrameworksTest") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
resource_config_file = resource_config_file =
......
...@@ -56,9 +56,9 @@ ohos_distributedtest("DbinderTest") { ...@@ -56,9 +56,9 @@ ohos_distributedtest("DbinderTest") {
] ]
external_deps = [ external_deps = [
"ipc:ipc_core",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "ipc:ipc_core",
"samgr_standard:samgr_proxy",
] ]
subsystem_name = "communication" subsystem_name = "communication"
...@@ -89,7 +89,7 @@ ohos_distributedtest("DbinderTestAgent") { ...@@ -89,7 +89,7 @@ ohos_distributedtest("DbinderTestAgent") {
external_deps = [ external_deps = [
"dsoftbus_standard:softbus_client", "dsoftbus_standard:softbus_client",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "samgr_standard:samgr_proxy",
] ]
subsystem_name = "communication" subsystem_name = "communication"
...@@ -114,7 +114,7 @@ ohos_executable("dbinder_test") { ...@@ -114,7 +114,7 @@ ohos_executable("dbinder_test") {
external_deps = [ external_deps = [
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
...@@ -139,7 +139,7 @@ ohos_executable("dbinder_send") { ...@@ -139,7 +139,7 @@ ohos_executable("dbinder_send") {
external_deps = [ external_deps = [
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"samgr_L2:samgr_proxy", "samgr_standard:samgr_proxy",
] ]
part_name = "ipc" part_name = "ipc"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册