openharmony/communication_ipc
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_ipc synced 2024-11-26 17:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:decouple dsoftbus

Browse Source 
Signed-off-by: hu-xiusong <huxiusong1@huawei.com>
This commit is contained in:
hu-xiusong 2024-09-04 13:35:12 +00:00
parent 54a2253ca0
commit e641324fc2
10 changed files with 1236 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundle.json
View File

@ -43,7 +43,8 @@
"bounds_checking_function", "bounds_checking_function",
"hisysevent", "hisysevent",
"json", "json",
"selinux" "selinux",
"rust"
], ],
"third_party": [ "third_party": [
] ]

9
config/BUILD.gn
View File

@ -17,7 +17,7 @@ import("../config.gni")
SUBSYSTEM_DIR = "../" SUBSYSTEM_DIR = "../"
IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native" IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native"
DSOFTBUS_INTERFACES_PATH = "../../dsoftbus" DSOFTBUS_INTERFACES_PATH = "$SUBSYSTEM_DIR/dl_deps"
config("ipc_util_config") { config("ipc_util_config") {
# header file path # header file path
@ -44,10 +44,5 @@ config("ipc_util_config") {
} }
config("dsoftbus_header_deps_config") { config("dsoftbus_header_deps_config") {
include_dirs = [ include_dirs = [ "$DSOFTBUS_INTERFACES_PATH" ]
"$DSOFTBUS_INTERFACES_PATH/interfaces/inner_kits/transport",
"$DSOFTBUS_INTERFACES_PATH/interfaces/kits/bus_center",
"$DSOFTBUS_INTERFACES_PATH/interfaces/kits/common",
"$DSOFTBUS_INTERFACES_PATH/interfaces/kits/transport",
]
} }

1225
dl_deps/dsoftbus_interface.h Normal file
View File

File diff suppressed because it is too large Load Diff

1
ipc/native/src/core/BUILD.gn
View File

@ -38,6 +38,7 @@ ohos_shared_library("ipc_common") {
] ]
configs = [ configs = [
"$SUBSYSTEM_DIR/config:dsoftbus_header_deps_config",
"$SUBSYSTEM_DIR/config:ipc_util_config", "$SUBSYSTEM_DIR/config:ipc_util_config",
":libipc_common_private_config", ":libipc_common_private_config",
] ]

4
ipc/native/src/core/include/dbinder_softbus_client.h
View File

@ -20,10 +20,8 @@
#include <string> #include <string>
#include <atomic> #include <atomic>
#include "inner_socket.h"
#include "nocopyable.h" #include "nocopyable.h"
#include "socket.h" #include "dsoftbus_interface.h"
#include "softbus_bus_center.h"
namespace OHOS { namespace OHOS {
enum { enum {

2
ipc/native/src/core/source/databus_socket_listener.cpp
View File

@ -20,7 +20,7 @@
#include "ipc_process_skeleton.h" #include "ipc_process_skeleton.h"
#include "ipc_thread_skeleton.h" #include "ipc_thread_skeleton.h"
#include "log_tags.h" #include "log_tags.h"
#include "softbus_error_code.h" #include "dsoftbus_interface.h"
namespace OHOS { namespace OHOS {
static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_ID_RPC_REMOTE_LISTENER, "DatabusSocketListener" }; static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_ID_RPC_REMOTE_LISTENER, "DatabusSocketListener" };

2
services/dbinder/dbinder_service/src/dbinder_service.cpp
View File

@ -27,7 +27,7 @@
#include "dbinder_sa_death_recipient.h" #include "dbinder_sa_death_recipient.h"
#include "dbinder_service_stub.h" #include "dbinder_service_stub.h"
#include "ffrt.h" #include "ffrt.h"
#include "softbus_bus_center.h" #include "dsoftbus_interface.h"
namespace OHOS { namespace OHOS {

2
services/dbinder/dbinder_service/src/socket/dbinder_remote_listener.cpp
View File

@ -21,7 +21,7 @@
#include "dbinder_error_code.h" #include "dbinder_error_code.h"
#include "dbinder_log.h" #include "dbinder_log.h"
#include "ipc_types.h" #include "ipc_types.h"
#include "softbus_error_code.h" #include "dsoftbus_interface.h"
namespace OHOS { namespace OHOS {
static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, LOG_ID_RPC_REMOTE_LISTENER, static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, LOG_ID_RPC_REMOTE_LISTENER,

2
services/dbinder/test/distributedtest/src/dbinder_test_agent.cpp
View File

@ -21,7 +21,7 @@
#include "distributed_agent.h" #include "distributed_agent.h"
#include "dbinder_service_test_helper.h" #include "dbinder_service_test_helper.h"
#include "log_tags.h" #include "log_tags.h"
#include "softbus_bus_center.h" #include "dsoftbus_interface.h"
using namespace testing; using namespace testing;
using namespace OHOS; using namespace OHOS;

2
services/dbinder/test/moduletest/src/rpc_client_test.cpp
View File

@ -17,7 +17,7 @@
#include "system_ability_definition.h" #include "system_ability_definition.h"
#include "if_system_ability_manager.h" #include "if_system_ability_manager.h"
#include "iservice_registry.h" #include "iservice_registry.h"
#include "softbus_bus_center.h" #include "dsoftbus_interface.h"
#include "ipc_skeleton.h" #include "ipc_skeleton.h"
#include "ipc_object_proxy.h" #include "ipc_object_proxy.h"
#include "rpc_test.h" #include "rpc_test.h"