openharmony/bundlemanager_bundle_framework_lite
1
0
Fork 0
mirror of https://github.com/openharmony/bundlemanager_bundle_framework_lite.git synced 2026-07-22 08:35:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix ipc problem

Browse Source 
Signed-off-by: shilei <shilei91@huawei.com>
Change-Id: I9da7aae99efdb0f384fb0455cbf6522334f2bcc7
This commit is contained in:
shilei
2022-07-21 22:18:08 +08:00
parent 134a173526
commit 60bbaf3129
8 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/bundle_lite/include/bundlems_slite_client.h
-1
View File
@@ -16,7 +16,6 @@
#ifndef OHOS_BUNDLEMS_SLITE_CLIENT_H #ifndef OHOS_BUNDLEMS_SLITE_CLIENT_H
#define OHOS_BUNDLEMS_SLITE_CLIENT_H #define OHOS_BUNDLEMS_SLITE_CLIENT_H
#include "iproxy_client.h"
#include "nocopyable.h" #include "nocopyable.h"
#include "want.h" #include "want.h"
#include "bundle_install_msg.h" #include "bundle_install_msg.h"
frameworks/bundle_lite/include/element_name_utils.h
+4
View File
@@ -16,7 +16,9 @@
#ifndef OHOS_ELEMENT_NAME_UTILS_H #ifndef OHOS_ELEMENT_NAME_UTILS_H
#define OHOS_ELEMENT_NAME_UTILS_H #define OHOS_ELEMENT_NAME_UTILS_H
#ifndef __LITEOS_M__
#include <serializer.h> #include <serializer.h>
#endif
#include "element_name.h" #include "element_name.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -25,11 +27,13 @@ extern "C" {
#endif #endif
#endif // __cplusplus #endif // __cplusplus
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
bool SerializeElement(IpcIo *io, const ElementName *element); bool SerializeElement(IpcIo *io, const ElementName *element);
bool DeserializeElement(ElementName *element, IpcIo *io); bool DeserializeElement(ElementName *element, IpcIo *io);
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
frameworks/bundle_lite/src/element_name.cpp
+4
View File
@@ -19,6 +19,7 @@
#include "utils.h" #include "utils.h"
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
namespace { namespace {
constexpr int VALUE_NULL = 0; constexpr int VALUE_NULL = 0;
@@ -28,6 +29,7 @@ namespace {
constexpr int MAX_DEVICE_ID = 1024; constexpr int MAX_DEVICE_ID = 1024;
} }
#endif #endif
#endif
void ClearElement(ElementName *element) void ClearElement(ElementName *element)
{ {
@@ -73,6 +75,7 @@ bool SetElementAbilityName(ElementName *element, const char *abilityName)
return element->abilityName != nullptr; return element->abilityName != nullptr;
} }
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
bool SerializeElement(IpcIo *io, const ElementName *element) bool SerializeElement(IpcIo *io, const ElementName *element)
{ {
@@ -133,4 +136,5 @@ bool DeserializeElement(ElementName *element, IpcIo *io)
} }
return true; return true;
} }
#endif
#endif #endif
interfaces/inner_api/bundlemgr_lite/bundle_service_interface.h
+4
View File
@@ -17,7 +17,11 @@
#define OHOS_BMS_INTERFACE_H #define OHOS_BMS_INTERFACE_H
#include "feature.h" #include "feature.h"
#ifndef __LITEOS_M__
#include "iproxy_server.h" #include "iproxy_server.h"
#else
#include "iunknown.h"
#endif
#include "want.h" #include "want.h"
#include "install_param.h" #include "install_param.h"
#include "bundle_manager.h" #include "bundle_manager.h"
interfaces/kits/bundle_lite/element_name.h
+4
View File
@@ -42,9 +42,11 @@
#ifndef OHOS_ELEMENT_NAME_H #ifndef OHOS_ELEMENT_NAME_H
#define OHOS_ELEMENT_NAME_H #define OHOS_ELEMENT_NAME_H
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
#include <serializer.h> #include <serializer.h>
#endif #endif
#endif
#include <stdbool.h> #include <stdbool.h>
/** /**
@@ -110,10 +112,12 @@ bool SetElementBundleName(ElementName *element, const char *bundleName);
*/ */
bool SetElementAbilityName(ElementName *element, const char *abilityName); bool SetElementAbilityName(ElementName *element, const char *abilityName);
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
bool SerializeElement(IpcIo *io, const ElementName *element); bool SerializeElement(IpcIo *io, const ElementName *element);
bool DeserializeElement(ElementName *element, IpcIo *io); bool DeserializeElement(ElementName *element, IpcIo *io);
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
} }
interfaces/kits/bundle_lite/slite/bundle_manager.h
-1
View File
@@ -40,7 +40,6 @@
#include "ability_info.h" #include "ability_info.h"
#include "bundle_info.h" #include "bundle_info.h"
#include "bundle_status_callback.h"
#include "install_param.h" #include "install_param.h"
#include "stdint.h" #include "stdint.h"
#include "want.h" #include "want.h"
services/bundlemgr_lite/include/bundle_util.h
+2
View File
@@ -20,10 +20,12 @@
#include "bundle_info.h" #include "bundle_info.h"
#include "utils_list.h" #include "utils_list.h"
#include "stdint.h" #include "stdint.h"
#ifndef __LITEOS_M__
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
#include <string> #include <string>
#include <vector> #include <vector>
#endif #endif
#endif
#include "cJSON.h" #include "cJSON.h"
#ifdef __LITEOS_M__ #ifdef __LITEOS_M__
services/bundlemgr_lite/src/bundle_mgr_slite_feature.cpp
-1
View File
@@ -15,7 +15,6 @@
#include "bundle_mgr_slite_feature.h" #include "bundle_mgr_slite_feature.h"
#include "bundle_service_interface.h"
#include "bundlems_log.h" #include "bundlems_log.h"
#include "ohos_init.h" #include "ohos_init.h"
#include "samgr_lite.h" #include "samgr_lite.h"