diff --git a/0002-fix-build-error-from-header-include.patch b/0002-fix-build-error-from-header-include.patch index e84a017..577e916 100644 --- a/0002-fix-build-error-from-header-include.patch +++ b/0002-fix-build-error-from-header-include.patch @@ -1,17 +1,18 @@ -From c4435b4448b3d8e95334528bbf0f2bdcf9ac5fa4 Mon Sep 17 00:00:00 2001 -From: heppen -Date: Sat, 23 Sep 2023 16:59:33 +0800 -Subject: [PATCH 2/2] adaption for build: remove useless headers, add some - headers +From 09f972fe8f4eb997f0a9820b66fba3564a655792 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 5 Mar 2024 21:22:16 +0800 +Subject: [PATCH] fix build error from header include --- - interfaces/innerkits/ipc_core/include/iremote_broker.h | 1 + - interfaces/innerkits/ipc_core/include/message_parcel.h | 1 + - ipc/native/src/core/source/ipc_object_proxy.cpp | 2 +- - ipc/native/src/core/source/iremote_broker.cpp | 2 +- - ipc/native/src/mock/include/invoker_factory.h | 1 + - ipc/native/src/mock/source/binder_connector.cpp | 2 +- - 6 files changed, 6 insertions(+), 3 deletions(-) + interfaces/innerkits/ipc_core/include/iremote_broker.h | 1 + + interfaces/innerkits/ipc_core/include/message_parcel.h | 1 + + interfaces/innerkits/libdbinder/include/dbinder_service.h | 1 + + ipc/native/src/core/include/ipc_process_skeleton.h | 1 + + ipc/native/src/core/source/ipc_object_proxy.cpp | 2 +- + ipc/native/src/core/source/iremote_broker.cpp | 2 +- + ipc/native/src/mock/include/invoker_factory.h | 1 + + ipc/native/src/mock/source/binder_connector.cpp | 2 +- + 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/ipc_core/include/iremote_broker.h b/interfaces/innerkits/ipc_core/include/iremote_broker.h index ed2045c..7105ff7 100644 @@ -37,6 +38,30 @@ index 0f3302e..efa57ab 100644 namespace OHOS { class IRemoteObject; +diff --git a/interfaces/innerkits/libdbinder/include/dbinder_service.h b/interfaces/innerkits/libdbinder/include/dbinder_service.h +index 6d3e6fa..7282c2c 100644 +--- a/interfaces/innerkits/libdbinder/include/dbinder_service.h ++++ b/interfaces/innerkits/libdbinder/include/dbinder_service.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "dbinder_service_stub.h" + #include "ipc_object_proxy.h" +diff --git a/ipc/native/src/core/include/ipc_process_skeleton.h b/ipc/native/src/core/include/ipc_process_skeleton.h +index 831b300..ea67e18 100644 +--- a/ipc/native/src/core/include/ipc_process_skeleton.h ++++ b/ipc/native/src/core/include/ipc_process_skeleton.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "invoker_rawdata.h" + #include "ipc_object_proxy.h" diff --git a/ipc/native/src/core/source/ipc_object_proxy.cpp b/ipc/native/src/core/source/ipc_object_proxy.cpp index 559c276..23f56a8 100644 --- a/ipc/native/src/core/source/ipc_object_proxy.cpp @@ -89,5 +114,5 @@ index a262de6..733769d 100644 #include "hilog/log_c.h" #include "hilog/log_cpp.h" -- -2.33.0 +2.43.0 diff --git a/0004-adapt-compilation-for-softbus_client.patch b/0004-adapt-compilation-for-softbus_client.patch index 626cd94..3467489 100644 --- a/0004-adapt-compilation-for-softbus_client.patch +++ b/0004-adapt-compilation-for-softbus_client.patch @@ -1,7 +1,7 @@ -From 618550c53de305101d2bd0946839aa6e57c86e96 Mon Sep 17 00:00:00 2001 -From: heppen -Date: Wed, 20 Dec 2023 18:54:05 +0800 -Subject: [PATCH] adapt compilation for softbus client +From 5a0cd36b8e5f06af4349d5c132a40354a8247a72 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 5 Mar 2024 21:26:27 +0800 +Subject: [PATCH] adapt compilation for softbus_client --- adapter/BUILD.gn | 2 +- @@ -33,7 +33,8 @@ Subject: [PATCH] adapt compilation for softbus client .../standard/init/src/softbus_server_stub.cpp | 137 ++++----- .../tcp_direct/src/trans_tcp_direct_manager.c | 2 +- .../tcp_direct/src/trans_tcp_direct_wifi.c | 2 +- - 29 files changed, 456 insertions(+), 329 deletions(-) + .../session/cpp/src/session_service_impl.cpp | 2 + + 30 files changed, 458 insertions(+), 329 deletions(-) create mode 100644 core/authentication/include/auth_config.h create mode 100644 core/authentication/src/auth_config.c @@ -1265,6 +1266,19 @@ index 868dfc5..c34b4de 100644 if (appInfo == NULL || connInfo == NULL || channelId == NULL) { return SOFTBUS_INVALID_PARAM; } +diff --git a/sdk/transmission/session/cpp/src/session_service_impl.cpp b/sdk/transmission/session/cpp/src/session_service_impl.cpp +index 73c2f3a..2acf520 100644 +--- a/sdk/transmission/session/cpp/src/session_service_impl.cpp ++++ b/sdk/transmission/session/cpp/src/session_service_impl.cpp +@@ -22,6 +22,8 @@ + #include "softbus_errcode.h" + #include "softbus_log.h" + ++#include ++ + namespace Communication { + namespace SoftBus { + std::shared_mutex ISessionService::instanceMutex_; -- -2.33.0 +2.43.0