94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
From c4435b4448b3d8e95334528bbf0f2bdcf9ac5fa4 Mon Sep 17 00:00:00 2001
|
|
From: heppen <hepeng68@huawei.com>
|
|
Date: Sat, 23 Sep 2023 16:59:33 +0800
|
|
Subject: [PATCH 2/2] adaption for build: remove useless headers, add some
|
|
headers
|
|
|
|
---
|
|
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(-)
|
|
|
|
diff --git a/interfaces/innerkits/ipc_core/include/iremote_broker.h b/interfaces/innerkits/ipc_core/include/iremote_broker.h
|
|
index ed2045c..7105ff7 100644
|
|
--- a/interfaces/innerkits/ipc_core/include/iremote_broker.h
|
|
+++ b/interfaces/innerkits/ipc_core/include/iremote_broker.h
|
|
@@ -18,6 +18,7 @@
|
|
|
|
#include <unordered_map>
|
|
#include <functional>
|
|
+#include <mutex>
|
|
#include "iremote_object.h"
|
|
#include "refbase.h"
|
|
|
|
diff --git a/interfaces/innerkits/ipc_core/include/message_parcel.h b/interfaces/innerkits/ipc_core/include/message_parcel.h
|
|
index 0f3302e..efa57ab 100644
|
|
--- a/interfaces/innerkits/ipc_core/include/message_parcel.h
|
|
+++ b/interfaces/innerkits/ipc_core/include/message_parcel.h
|
|
@@ -20,6 +20,7 @@
|
|
#include "parcel.h"
|
|
#include "refbase.h"
|
|
#include <string>
|
|
+#include <memory>
|
|
|
|
namespace OHOS {
|
|
class IRemoteObject;
|
|
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
|
|
+++ b/ipc/native/src/core/source/ipc_object_proxy.cpp
|
|
@@ -17,7 +17,7 @@
|
|
|
|
#include <cstdint>
|
|
|
|
-#include "__mutex_base"
|
|
+// #include "__mutex_base"
|
|
#include "algorithm"
|
|
#include "errors.h"
|
|
#include "hilog/log_c.h"
|
|
diff --git a/ipc/native/src/core/source/iremote_broker.cpp b/ipc/native/src/core/source/iremote_broker.cpp
|
|
index dcbb59c..12f498e 100644
|
|
--- a/ipc/native/src/core/source/iremote_broker.cpp
|
|
+++ b/ipc/native/src/core/source/iremote_broker.cpp
|
|
@@ -17,7 +17,7 @@
|
|
|
|
#include <utility>
|
|
|
|
-#include "__mutex_base"
|
|
+// #include "__mutex_base"
|
|
#include "functional"
|
|
#include "hilog/log_c.h"
|
|
#include "hilog/log_cpp.h"
|
|
diff --git a/ipc/native/src/mock/include/invoker_factory.h b/ipc/native/src/mock/include/invoker_factory.h
|
|
index 14bd25f..83086c5 100644
|
|
--- a/ipc/native/src/mock/include/invoker_factory.h
|
|
+++ b/ipc/native/src/mock/include/invoker_factory.h
|
|
@@ -17,6 +17,7 @@
|
|
#define OHOS_IPC_INVOKER_FACTORY_H
|
|
|
|
#include <functional>
|
|
+#include <mutex>
|
|
#include <unordered_map>
|
|
#include "iremote_invoker.h"
|
|
|
|
diff --git a/ipc/native/src/mock/source/binder_connector.cpp b/ipc/native/src/mock/source/binder_connector.cpp
|
|
index a262de6..733769d 100644
|
|
--- a/ipc/native/src/mock/source/binder_connector.cpp
|
|
+++ b/ipc/native/src/mock/source/binder_connector.cpp
|
|
@@ -21,7 +21,7 @@
|
|
#include <sys/mman.h>
|
|
#include <unistd.h>
|
|
|
|
-#include "__mutex_base"
|
|
+// #include "__mutex_base"
|
|
#include "cerrno"
|
|
#include "hilog/log_c.h"
|
|
#include "hilog/log_cpp.h"
|
|
--
|
|
2.33.0
|
|
|