openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 15:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue: https://gitee.com/openharmony/ability_ability_runtime/issues/I9SDN2?from=project-issue

Browse Source 
Comment: 剩余整改

Signed-off-by: jiangzhijun8 <jiangzhijun7@huawei.com>
This commit is contained in:
jiangzhijun8 2024-05-27 03:08:03 +00:00
parent 927af4c881
commit eaea59d986
24 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frameworks/js/napi/inner/napi_ability_common/BUILD.gn
View File

@ -56,7 +56,10 @@ ohos_shared_library("napi_ability_common") {
"napi:ace_napi",
]
public_external_deps = [ "bundle_framework:appexecfwk_core" ]
public_external_deps = [
"bundle_framework:appexecfwk_core",
"window_manager:libwm_lite",
]
if (ability_runtime_graphics) {
defines = [ "SUPPORT_GRAPHICS" ]

5
frameworks/js/napi/inner/napi_common/BUILD.gn
View File

@ -61,7 +61,10 @@ ohos_shared_library("napi_common") {
"napi:ace_napi",
]
public_external_deps = [ "bundle_framework:appexecfwk_core" ]
public_external_deps = [
"bundle_framework:appexecfwk_core",
"window_manager:libwm_lite",
]
if (ability_runtime_graphics) {
defines = [ "SUPPORT_GRAPHICS" ]

7
frameworks/native/ability/native/BUILD.gn
View File

@ -96,7 +96,6 @@ config("ability_public_config") {
include_dirs += [
"${form_fwk_path}/interfaces/kits/native/include",
"${form_fwk_path}/interfaces/inner_api/include",
"${windowmanager_path}/interfaces/innerkits/wm",
"${windowmanager_path}/interfaces/innerkits/dm",
"${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi",
"${windowmanager_path}/utils/include",
@ -114,7 +113,6 @@ config("abilitykit_utils_public_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
"${ability_runtime_innerkits_path}/app_manager/include/appmgr",
"${bundlefwk_inner_api_path}/appexecfwk_base/include",
"//third_party/json/include",
]
@ -349,7 +347,6 @@ config("extensionkit_public_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
"${ability_runtime_innerkits_path}/app_manager/include/appmgr",
"${bundlefwk_inner_api_path}/appexecfwk_base/include",
"//third_party/json/include",
]
@ -476,7 +473,6 @@ config("uiability_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
"${ability_runtime_services_path}/abilitymgr/include",
"${bundlefwk_inner_api_path}/appexecfwk_base/include",
]
if (ability_runtime_graphics) {
@ -711,6 +707,7 @@ ohos_shared_library("form_extension_module") {
"c_utils:utils",
"hilog:libhilog",
"napi:ace_napi",
"window_manager:libwm",
]
relative_install_dir = "extensionability"
@ -814,6 +811,7 @@ ohos_shared_library("continuation_ipc") {
"ipc:ipc_core",
"node:node_header_notice",
"resource_management:global_resmgr",
"window_manager:libwm",
]
public_external_deps = [
"accessibility:accessibility_common",
@ -858,6 +856,7 @@ ohos_shared_library("data_ability_helper") {
"relational_store:native_dataability",
"relational_store:native_rdb",
"relational_store:rdb_data_ability_adapter",
"window_manager:libwm",
]
innerapi_tags = [ "platformsdk" ]

3
interfaces/inner_api/ability_manager/BUILD.gn
View File

@ -152,7 +152,10 @@ ohos_shared_library("ability_manager") {
"ability_base:want",
"ability_base:zuri",
"bundle_framework:appexecfwk_core",
"init:libbegetutil",
"jsoncpp:jsoncpp",
"relational_store:native_dataability",
"relational_store:native_rdb",
]
if (ability_runtime_graphics) {

2
interfaces/inner_api/app_manager/BUILD.gn
View File

@ -139,6 +139,8 @@ ohos_shared_library("app_manager") {
public_external_deps = [
"ability_base:want",
"bundle_framework:appexecfwk_base",
"image_framework:image_native",
"relational_store:native_rdb",
]
if (background_task_mgr_continuous_task_enable) {

7
services/abilitymgr/BUILD.gn
View File

@ -42,8 +42,6 @@ config("abilityms_config") {
"//prebuilts/jdk/jdk8/linux-x86/include/linux",
"//third_party/json/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native",
"${relational_store_innerapi_path}/rdb/include",
"${relational_store_innerapi_path}/dataability/include",
"${ability_runtime_innerkits_path}/dataobs_manager/include",
"${ability_runtime_path}/tools/aa/include",
"${ability_runtime_innerkits_path}/wantagent/include",
@ -54,8 +52,6 @@ config("abilityms_config") {
"${ability_runtime_utils_path}/server/constant",
"${bgtaskmgr_frameworks_path}/common/include",
"${bgtaskmgr_frameworks_path}/include",
"${init_path}/interfaces/innerkits/include/syspara/",
"${bundlefwk_inner_api_path}/appexecfwk_core/include",
]
defines = []
@ -71,8 +67,6 @@ config("abilityms_config") {
if (ability_runtime_graphics) {
include_dirs += [
"${graphic_path}/interfaces/inner_api",
"${graphic_path}/utils/color_manager/export",
"${multimedia_path}/interfaces/innerkits/include",
"${graphic_path}/interfaces/inner_api/wmservice",
"${global_path}/i18n/frameworks/intl/include",
]
@ -162,6 +156,7 @@ ohos_shared_library("abilityms") {
"config_policy:configpolicy_util",
"dsoftbus:softbus_client",
"ffrt:libffrt",
"graphic_2d:color_manager",
"hicollie:libhicollie",
"hilog:libhilog",
"hisysevent:libhisysevent",

5
services/uripermmgr/BUILD.gn
View File

@ -70,11 +70,16 @@ ohos_shared_library("libupms") {
"common_event_service:cesfwk_core",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"graphic_2d:color_manager",
"hilog:libhilog",
"hisysevent:libhisysevent",
"image_framework:image_native",
"init:libbeget_proxy",
"init:libbegetutil",
"init:libbegetutil",
"ipc:ipc_core",
"relational_store:native_dataability",
"relational_store:native_rdb",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"storage_service:storage_manager_sa_proxy",

1
test/moduletest/ability_manager_service_dump_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_moduletest("ability_manager_service_dump_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/moduletest/call_module_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_moduletest("call_ability_service_module_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
View File

@ -43,6 +43,7 @@ ohos_moduletest("specified_ability_service_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"samgr:samgr_proxy",
]

1
test/moduletest/mission_dump_test/BUILD.gn
View File

@ -60,6 +60,7 @@ ohos_moduletest("mission_dump_test") {
"dsoftbus:softbus_client",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"napi:ace_napi",
]

1
test/moduletest/on_new_want_module_test/BUILD.gn
View File

@ -43,6 +43,7 @@ ohos_moduletest("on_new_want_module_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/moduletest/start_option_display_id_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_moduletest("start_option_module_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/ability_manager_service_second_test/BUILD.gn
View File

@ -56,6 +56,7 @@ ohos_unittest("ability_manager_service_second_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/ability_manager_service_third_test/BUILD.gn
View File

@ -73,6 +73,7 @@ ohos_unittest("ability_manager_service_third_test") {
"config_policy:configpolicy_util",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"samgr:samgr_proxy",

1
test/unittest/ability_record_test/BUILD.gn
View File

@ -149,6 +149,7 @@ ohos_unittest("ability_record_test_call") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"napi:ace_napi",

1
test/unittest/ability_timeout_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_unittest("ability_timeout_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/call_container_test/BUILD.gn
View File

@ -56,6 +56,7 @@ ohos_unittest("call_container_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"napi:ace_napi",
]

1
test/unittest/configuration_test/BUILD.gn
View File

@ -62,6 +62,7 @@ ohos_unittest("configuration_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
"napi:ace_napi",
"resource_management:global_resmgr",

1
test/unittest/free_install_manager_test/BUILD.gn
View File

@ -44,6 +44,7 @@ ohos_unittest("free_install_manager_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/lifecycle_test/BUILD.gn
View File

@ -47,6 +47,7 @@ ohos_unittest("lifecycle_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/running_infos_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_unittest("running_infos_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

1
test/unittest/start_option_display_id_test/BUILD.gn
View File

@ -41,6 +41,7 @@ ohos_unittest("start_option_display_id_test") {
"common_event_service:cesfwk_innerkits",
"ffrt:libffrt",
"hilog:libhilog",
"init:libbegetutil",
"ipc:ipc_core",
]

5
tools/aa/BUILD.gn
View File

@ -67,7 +67,12 @@ ohos_static_library("tools_aa_source_set") {
]
public_external_deps = [
"bundle_framework:appexecfwk_base",
"graphic_2d:color_manager",
"image_framework:image_native",
"init:libbegetutil",
"jsoncpp:jsoncpp",
"relational_store:native_dataability",
"relational_store:native_rdb",
"samgr:samgr_proxy",
]