Signed-off-by: yuwenze <yuwenze1@huawei.com>
Change-Id: Ic1a8475c6b0442c17bcb4ef1b4dc79769b697aad
This commit is contained in:
yuwenze 2023-08-09 11:27:31 +00:00
parent 02cc0167bf
commit 609de8cae9
37 changed files with 45 additions and 13 deletions

View File

@ -361,7 +361,8 @@
"header": {
"header_base": "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include",
"header_files": [
"mission_info.h"
"mission_info.h",
"mission_snapshot.h"
]
},
"name": "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:mission_info"

View File

@ -28,6 +28,7 @@ ohos_shared_library("missionmanager") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:ability_business_error",

View File

@ -28,6 +28,7 @@ ohos_shared_library("missionmanager_napi") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
@ -76,6 +77,7 @@ ohos_shared_library("distributedmissionmanager") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:abilitykit_native",

View File

@ -237,6 +237,7 @@ ohos_shared_library("abilitykit_native") {
":extension_blocklist_config",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager",
"${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
"${ability_runtime_innerkits_path}/napi_base_context:napi_base_context",

View File

@ -79,10 +79,8 @@ ohos_shared_library("ability_manager") {
"${ability_runtime_services_path}/abilitymgr/src/image_info.cpp",
"${ability_runtime_services_path}/abilitymgr/src/launch_param.cpp",
"${ability_runtime_services_path}/abilitymgr/src/lifecycle_state_info.cpp",
"${ability_runtime_services_path}/abilitymgr/src/mission_info.cpp",
"${ability_runtime_services_path}/abilitymgr/src/mission_listener_proxy.cpp",
"${ability_runtime_services_path}/abilitymgr/src/mission_listener_stub.cpp",
"${ability_runtime_services_path}/abilitymgr/src/mission_snapshot.cpp",
"${ability_runtime_services_path}/abilitymgr/src/prepare_terminate_callback_proxy.cpp",
"${ability_runtime_services_path}/abilitymgr/src/prepare_terminate_callback_stub.cpp",
"${ability_runtime_services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp",
@ -112,6 +110,7 @@ ohos_shared_library("ability_manager") {
deps = [
":ability_start_setting",
":mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"//third_party/jsoncpp:jsoncpp",
]
@ -155,8 +154,10 @@ ohos_shared_library("ability_manager") {
}
ohos_shared_library("mission_info") {
sources =
[ "${ability_runtime_services_path}/abilitymgr/src/mission_info.cpp" ]
sources = [
"${ability_runtime_services_path}/abilitymgr/src/mission_info.cpp",
"${ability_runtime_services_path}/abilitymgr/src/mission_snapshot.cpp",
]
public_configs = [ ":ability_manager_public_config" ]
@ -165,6 +166,11 @@ ohos_shared_library("mission_info") {
"c_utils:utils",
"ipc:ipc_core",
]
if (ability_runtime_graphics) {
external_deps += [ "image_framework:image_native" ]
}
cflags_cc = []
innerapi_tags = [ "platformsdk" ]
subsystem_name = "ability"

View File

@ -16,8 +16,6 @@
#ifndef OHOS_ABILITY_RUNTIME_MISSION_SNAPSHOT_H
#define OHOS_ABILITY_RUNTIME_MISSION_SNAPSHOT_H
#include <string>
#include "image_info.h"
#include "parcel.h"
#include "element_name.h"
#ifdef SUPPORT_GRAPHICS

View File

@ -126,6 +126,7 @@ ohos_shared_library("abilityms") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager",
"${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",

View File

@ -48,7 +48,6 @@ abilityms_files = [
"src/pending_want_common_event.cpp",
"src/ams_configuration_parameter.cpp",
"src/image_info.cpp",
"src/mission_snapshot.cpp",
"src/window_focus_changed_listener.cpp",
# start ability handler
@ -65,7 +64,6 @@ abilityms_files = [
"src/inner_mission_info.cpp",
"src/mission.cpp",
"src/mission_data_storage.cpp",
"src/mission_info.cpp",
"src/mission_info_mgr.cpp",
"src/mission_listener_controller.cpp",
"src/mission_listener_proxy.cpp",

View File

@ -15,10 +15,6 @@
#include "mission_snapshot.h"
#include "hilog_wrapper.h"
#include "nlohmann/json.hpp"
#include "string_ex.h"
namespace OHOS {
namespace AAFwk {
bool MissionSnapshot::ReadFromParcel(Parcel &parcel)

View File

@ -44,6 +44,7 @@ ohos_fuzztest("AbilityManagerServiceAFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -44,6 +44,7 @@ ohos_fuzztest("AbilityManagerServiceSecondFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -44,6 +44,7 @@ ohos_fuzztest("AbilityManagerServiceTenthFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -36,6 +36,7 @@ ohos_fuzztest("AbilityMgrRestFuzzTest") {
configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ]
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -40,6 +40,7 @@ ohos_fuzztest("GetMissionInfosFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"//third_party/jsoncpp:jsoncpp",
]

View File

@ -40,6 +40,7 @@ ohos_fuzztest("GetMissionSnapshotFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -46,6 +46,7 @@ ohos_fuzztest("MissionDataStorageAFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -46,6 +46,7 @@ ohos_fuzztest("MissionDataStorageBFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -44,6 +44,7 @@ ohos_fuzztest("MissionInfoMgrAFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -44,6 +44,7 @@ ohos_fuzztest("MissionInfoMgrBFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -44,6 +44,7 @@ ohos_fuzztest("MissionInfoMgrCFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -46,6 +46,7 @@ ohos_fuzztest("MissionListManagerFirstFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -46,6 +46,7 @@ ohos_fuzztest("MissionListManagerSecondFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -46,6 +46,7 @@ ohos_fuzztest("PendingWantManagerFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -43,6 +43,7 @@ ohos_fuzztest("SetMissionContinueStateFuzzTest") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
]

View File

@ -40,6 +40,7 @@ ohos_unittest("ability_manager_client_branch_test") {
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -41,6 +41,7 @@ ohos_unittest("ability_manager_proxy_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -39,6 +39,7 @@ ohos_unittest("ability_manager_service_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
"${ability_runtime_services_path}/abilitymgr:abilityms",

View File

@ -41,6 +41,7 @@ ohos_unittest("ability_manager_stub_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/common:perm_verification",
"${ability_runtime_services_path}/common:task_handler_wrap",

View File

@ -41,6 +41,7 @@ ohos_unittest("ability_record_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -40,6 +40,7 @@ ohos_unittest("ability_context_impl_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability:ability_context_native",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",

View File

@ -1663,6 +1663,7 @@ ohos_unittest("distributed_client_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/appkit:app_context",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",

View File

@ -38,6 +38,7 @@ ohos_unittest("mission_data_storage_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -39,6 +39,7 @@ ohos_unittest("mission_info_mgr_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -38,6 +38,7 @@ ohos_unittest("mission_info_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -40,6 +40,7 @@ ohos_unittest("mission_list_manager_test") {
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -38,6 +38,7 @@ ohos_unittest("task_data_persistence_mgr_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",

View File

@ -53,6 +53,7 @@ ohos_source_set("tools_aa_source_set") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:mission_info",
"${ability_runtime_innerkits_path}/app_manager:app_manager",
]