Signed-off-by: xuzheheng <xuzheheng1@huawei.com>
Change-Id: Ic43b057f3e67a6d34ea0662f4eefb14495027fbe
This commit is contained in:
xuzheheng
2022-07-04 16:08:05 +08:00
parent c6d09e38c9
commit a9926d4cdc
21 changed files with 14 additions and 16 deletions
+2 -2
View File
@@ -82,7 +82,7 @@
"//foundation/ability/ability_runtime/frameworks/native/ability:ability_context_native",
"//foundation/ability/ability_runtime/frameworks/native/appkit:app_context",
"//foundation/ability/ability_runtime/frameworks/native/appkit:appkit_native",
"//foundation/ability/ability_runtime/frameworks/kits/wantagent:wantagent_innerkits"
"//foundation/ability/ability_runtime/interfaces/inner_api/wantagent:wantagent_innerkits"
],
"inner_kits": [
{
@@ -101,7 +101,7 @@
"want_agent.h"
]
},
"name": "//foundation/ability/ability_runtime/frameworks/kits/wantagent:wantagent_innerkits"
"name": "//foundation/ability/ability_runtime/interfaces/inner_api/wantagent:wantagent_innerkits"
},
{
"header": {
@@ -29,7 +29,6 @@ ohos_unittest("completed_dispatcher_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
"//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("completed_dispatcher_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
@@ -33,7 +33,6 @@ ohos_unittest("pending_want_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:app_context",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
@@ -48,6 +47,7 @@ ohos_unittest("pending_want_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
@@ -29,7 +29,6 @@ ohos_unittest("trigger_Info_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
"//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("trigger_Info_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
@@ -33,7 +33,6 @@ ohos_unittest("want_agent_helper_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:app_context",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
@@ -48,6 +47,7 @@ ohos_unittest("want_agent_helper_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
@@ -29,7 +29,6 @@ ohos_unittest("want_agent_info_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
"//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("want_agent_info_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
@@ -29,7 +29,6 @@ ohos_unittest("want_agent_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${ability_runtime_path}/services/abilitymgr:abilityms",
"//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("want_agent_test") {
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
+1 -1
View File
@@ -193,7 +193,7 @@ ohos_shared_library("abilitykit_native") {
public_configs = [
":ability_public_config",
"${ability_runtime_path}/frameworks/native/ability:ability_context_public_config",
"${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config",
"${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits_public_config",
]
deps = [
@@ -46,7 +46,7 @@ ohos_moduletest("PandingWantMgrTest") {
deps = [
"${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
"${ability_runtime_path}/frameworks/native/appkit:app_context",
"${ability_runtime_path}/interfaces/inner_api/app_manager:app_manager",
@@ -36,11 +36,10 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") {
sources = [ "wantagenthelperstring_fuzzer.cpp" ]
deps = [ "${ability_runtime_kits_path}/wantagent:wantagent_innerkits" ]
external_deps = [
"ability_base:base",
"ability_base:want",
"ability_runtime:wantagent_innerkits",
"ipc:ipc_core",
"utils_base:utils",
]
@@ -36,11 +36,10 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") {
sources = [ "wantagenthelpertrigger_fuzzer.cpp" ]
deps = [ "${ability_runtime_kits_path}/wantagent:wantagent_innerkits" ]
external_deps = [
"ability_base:base",
"ability_base:want",
"ability_runtime:wantagent_innerkits",
"ipc:ipc_core",
"utils_base:utils",
]
@@ -42,7 +42,6 @@ ohos_shared_library("amsAbilityVisibleTestPageA") {
]
configs = [ ":amsAbilityVisibleTestPageAConfig" ]
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
"${ability_runtime_path}/frameworks/native/appkit:app_context",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
@@ -55,6 +54,7 @@ ohos_shared_library("amsAbilityVisibleTestPageA") {
external_deps = [
"ability_base:want",
"ability_base:zuri",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
"common_event_service:cesfwk_innerkits",
@@ -43,7 +43,6 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") {
]
configs = [ ":amsAbilityVisibleTestServiceBConfig" ]
deps = [
"${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
"${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
"${ability_runtime_path}/frameworks/native/appkit:app_context",
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
@@ -56,6 +55,7 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") {
external_deps = [
"ability_base:want",
"ability_base:zuri",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
"common_event_service:cesfwk_innerkits",