From 30d11b647b9e613d8ac6844a800efbc131364ee1 Mon Sep 17 00:00:00 2001 From: jiangzhijun8 Date: Sat, 6 Jul 2024 10:14:41 +0000 Subject: [PATCH] Issue: https://gitee.com/openharmony/ability_ability_base/issues/IAB0NZ?from=project-issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Comment: 消除ability_ability_base中all_dependent_configs Signed-off-by: jiangzhijun8 --- frameworks/js/napi/inner/napi_common/BUILD.gn | 2 +- frameworks/native/ability/native/BUILD.gn | 3 ++- frameworks/native/appkit/BUILD.gn | 2 +- interfaces/inner_api/ability_manager/BUILD.gn | 2 +- interfaces/inner_api/app_manager/BUILD.gn | 1 + interfaces/inner_api/deps_wrapper/BUILD.gn | 3 +++ interfaces/inner_api/extension_manager/BUILD.gn | 2 ++ interfaces/inner_api/runtime/BUILD.gn | 2 ++ .../interfaces/kits/js/serviceroutermgr/BUILD.gn | 1 + .../appexecfwk_appkit_native_app_module_test/BUILD.gn | 4 ++++ test/unittest/ams_ipc_interface_test/BUILD.gn | 1 + test/unittest/dfr_test/watchdog_test/BUILD.gn | 1 + test/unittest/frameworks_kits_appkit_native_test/BUILD.gn | 1 + tools/aa/BUILD.gn | 2 +- tools/test/moduletest/aa/BUILD.gn | 4 ++++ tools/test/moduletest/ability_delegator/BUILD.gn | 1 + tools/test/systemtest/aa/BUILD.gn | 3 +++ tools/test/unittest/aa/BUILD.gn | 2 ++ tools/test/unittest/ability_delegator/BUILD.gn | 2 ++ tools/test/unittest/ability_tool/BUILD.gn | 1 + 20 files changed, 35 insertions(+), 5 deletions(-) diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 8392c3b08c..ede3bc89ff 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -48,7 +48,6 @@ ohos_shared_library("napi_common") { external_deps = [ "ability_base:base", - "ability_base:session_info", "ability_base:want", "access_token:libtokenid_sdk", "c_utils:utils", @@ -63,6 +62,7 @@ ohos_shared_library("napi_common") { public_external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_core", ] diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index c51f81674d..76b4b308b9 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -252,7 +252,6 @@ ohos_shared_library("abilitykit_native") { "ability_base:base", "ability_base:configuration", "ability_base:extractortool", - "ability_base:session_info", "ability_base:want", "ability_base:zuri", "access_token:libaccesstoken_sdk", @@ -279,6 +278,7 @@ ohos_shared_library("abilitykit_native") { } public_external_deps = [ + "ability_base:session_info", "accessibility:accessibility_common", "bundle_framework:appexecfwk_core", "jsoncpp:jsoncpp", @@ -411,6 +411,7 @@ ohos_shared_library("extensionkit_native") { public_deps = [ ":abilitykit_utils" ] public_external_deps = [ + "ability_base:session_info", "bundle_framework:appexecfwk_core", "jsoncpp:jsoncpp", ] diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index de113bb9cd..2bbab96645 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -299,7 +299,6 @@ ohos_shared_library("app_context") { external_deps = [ "ability_base:extractortool", - "ability_base:session_info", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -315,6 +314,7 @@ ohos_shared_library("app_context") { ] public_external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", ] diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index d987116005..55a55362dd 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -135,7 +135,6 @@ ohos_shared_library("ability_manager") { external_deps = [ "ability_base:base", - "ability_base:session_info", "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -153,6 +152,7 @@ ohos_shared_library("ability_manager") { public_external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "ability_base:zuri", "background_task_mgr:bgtaskmgr_innerkits", diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index 523bbdc736..2fde06c872 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -139,6 +139,7 @@ ohos_shared_library("app_manager") { ] public_external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "image_framework:image_native", diff --git a/interfaces/inner_api/deps_wrapper/BUILD.gn b/interfaces/inner_api/deps_wrapper/BUILD.gn index d83a3d17de..e11bdfc5f2 100644 --- a/interfaces/inner_api/deps_wrapper/BUILD.gn +++ b/interfaces/inner_api/deps_wrapper/BUILD.gn @@ -41,6 +41,9 @@ ohos_shared_library("ability_deps_wrapper") { configs = [ ":ability_deps_wrapper_private_config" ] external_deps = [ + "ability_base:base", + "ability_base:want", + "ability_base:zuri", "c_utils:utils", "hilog:libhilog", "samgr:samgr_proxy", diff --git a/interfaces/inner_api/extension_manager/BUILD.gn b/interfaces/inner_api/extension_manager/BUILD.gn index 5e80e8c57a..5ee5eb07f2 100755 --- a/interfaces/inner_api/extension_manager/BUILD.gn +++ b/interfaces/inner_api/extension_manager/BUILD.gn @@ -56,6 +56,8 @@ ohos_shared_library("extension_manager") { "samgr:samgr_proxy", ] + public_external_deps = [ "ability_base:session_info" ] + innerapi_tags = [ "platformsdk" ] subsystem_name = "ability" part_name = "ability_runtime" diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index 0ff322f081..a6c7a12036 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -118,6 +118,8 @@ ohos_shared_library("runtime") { "zlib:shared_libz", ] + public_external_deps = [ "ability_base:session_info" ] + defines = [] if (cj_frontend) { diff --git a/service_router_framework/interfaces/kits/js/serviceroutermgr/BUILD.gn b/service_router_framework/interfaces/kits/js/serviceroutermgr/BUILD.gn index 31897fa8e1..75a5e68f17 100755 --- a/service_router_framework/interfaces/kits/js/serviceroutermgr/BUILD.gn +++ b/service_router_framework/interfaces/kits/js/serviceroutermgr/BUILD.gn @@ -40,6 +40,7 @@ ohos_shared_library("businessabilityrouter") { ] external_deps = [ + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn b/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn index 85ef4d4020..5355a371f8 100644 --- a/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn +++ b/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn @@ -54,6 +54,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -91,6 +92,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -128,6 +130,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -165,6 +168,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ams_ipc_interface_test/BUILD.gn b/test/unittest/ams_ipc_interface_test/BUILD.gn index 60b9d774c4..322611ae57 100644 --- a/test/unittest/ams_ipc_interface_test/BUILD.gn +++ b/test/unittest/ams_ipc_interface_test/BUILD.gn @@ -33,6 +33,7 @@ ohos_unittest("AmsIpcAppSchedulerInterfaceTest") { external_deps = [ "ability_base:base", "ability_base:configuration", + "ability_base:want", "ability_base:zuri", "hilog:libhilog", "ipc:ipc_core", diff --git a/test/unittest/dfr_test/watchdog_test/BUILD.gn b/test/unittest/dfr_test/watchdog_test/BUILD.gn index 0c9afbb19d..6d44086aa8 100644 --- a/test/unittest/dfr_test/watchdog_test/BUILD.gn +++ b/test/unittest/dfr_test/watchdog_test/BUILD.gn @@ -72,6 +72,7 @@ ohos_unittest("watchdog_test") { external_deps = [ "ability_base:base", + "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index 1390e342cd..e31e8c4c45 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -711,6 +711,7 @@ ohos_unittest("idle_time_test") { ] external_deps = [ + "ability_base:want", "ability_runtime:runtime", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index c1ff67f383..8b0403ee92 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -62,7 +62,6 @@ ohos_static_library("tools_aa_source_set") { external_deps = [ "ability_base:base", - "ability_base:session_info", "ability_base:want", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -72,6 +71,7 @@ ohos_static_library("tools_aa_source_set") { "ipc:ipc_core", ] public_external_deps = [ + "ability_base:session_info", "bundle_framework:appexecfwk_base", "graphic_2d:color_manager", "image_framework:image_native", diff --git a/tools/test/moduletest/aa/BUILD.gn b/tools/test/moduletest/aa/BUILD.gn index fa265c6b35..9d72e6a148 100644 --- a/tools/test/moduletest/aa/BUILD.gn +++ b/tools/test/moduletest/aa/BUILD.gn @@ -48,6 +48,7 @@ ohos_moduletest("aa_command_dumpsys_module_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "c_utils:utils", "hilog:libhilog", @@ -77,6 +78,7 @@ ohos_moduletest("aa_command_start_module_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -105,6 +107,7 @@ ohos_moduletest("aa_command_stop_service_module_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -133,6 +136,7 @@ ohos_moduletest("aa_command_dump_module_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", diff --git a/tools/test/moduletest/ability_delegator/BUILD.gn b/tools/test/moduletest/ability_delegator/BUILD.gn index 0bc2173fcf..256050d24a 100644 --- a/tools/test/moduletest/ability_delegator/BUILD.gn +++ b/tools/test/moduletest/ability_delegator/BUILD.gn @@ -88,6 +88,7 @@ ohos_moduletest("shell_command_result_module_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", diff --git a/tools/test/systemtest/aa/BUILD.gn b/tools/test/systemtest/aa/BUILD.gn index f86b92e9de..8c4c77b086 100644 --- a/tools/test/systemtest/aa/BUILD.gn +++ b/tools/test/systemtest/aa/BUILD.gn @@ -49,6 +49,7 @@ ohos_systemtest("aa_command_start_system_test") { external_deps = [ "ability_base:base", "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -81,6 +82,7 @@ ohos_systemtest("aa_command_stop_service_system_test") { external_deps = [ "ability_base:base", "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -117,6 +119,7 @@ ohos_systemtest("aa_command_dump_system_test") { external_deps = [ "ability_base:base", "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", diff --git a/tools/test/unittest/aa/BUILD.gn b/tools/test/unittest/aa/BUILD.gn index 9227f8570e..b87071aa47 100644 --- a/tools/test/unittest/aa/BUILD.gn +++ b/tools/test/unittest/aa/BUILD.gn @@ -297,6 +297,7 @@ ohos_unittest("aa_command_attach_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -326,6 +327,7 @@ if (accessibility_enable) { ] external_deps = [ + "ability_base:session_info", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/tools/test/unittest/ability_delegator/BUILD.gn b/tools/test/unittest/ability_delegator/BUILD.gn index 98b3cb1bed..cb7b783500 100644 --- a/tools/test/unittest/ability_delegator/BUILD.gn +++ b/tools/test/unittest/ability_delegator/BUILD.gn @@ -125,6 +125,7 @@ ohos_unittest("shell_command_result_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core", @@ -181,6 +182,7 @@ if (accessibility_enable) { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/tools/test/unittest/ability_tool/BUILD.gn b/tools/test/unittest/ability_tool/BUILD.gn index f4e87fd465..2eb5fc8d08 100644 --- a/tools/test/unittest/ability_tool/BUILD.gn +++ b/tools/test/unittest/ability_tool/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("ability_tool_test") { external_deps = [ "ability_base:configuration", + "ability_base:session_info", "bundle_framework:appexecfwk_base", "hilog:libhilog", "ipc:ipc_core",