From 15578f21887b55158229fedef6f014bb5c78e827 Mon Sep 17 00:00:00 2001 From: dy_study Date: Tue, 5 Jul 2022 17:06:30 +0800 Subject: [PATCH] =?UTF-8?q?IssueNo:#I5FM6S=20Description:=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=8C=96=E4=B8=8D=E8=A7=84=E8=8C=83=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20Sig:SIG=5FApplicaitonFramework=20Feature?= =?UTF-8?q?=20or=20Bugfix:Bugfix=20Binary=20Source:No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dy_study Change-Id: Ia64d76a96ab2779574fcbb6e880cd40ac6e64d3d --- README_zh.md | 2 +- ability_runtime.gni | 2 +- figures/{aafwk.png => ability.png} | Bin frameworks/kits/ability/native/test/BUILD.gn | 5 ----- frameworks/kits/appkit/native/test/BUILD.gn | 10 ++-------- frameworks/kits/appkit/test/BUILD.gn | 3 --- frameworks/kits/test/BUILD.gn | 7 +------ frameworks/native/appkit/BUILD.gn | 2 +- interfaces/inner_api/ability_manager/BUILD.gn | 8 ++++---- interfaces/inner_api/app_manager/BUILD.gn | 4 ++-- interfaces/inner_api/wantagent/BUILD.gn | 2 +- services/abilitymgr/BUILD.gn | 6 +++--- services/abilitymgr/test/BUILD.gn | 3 +++ .../test/mock/appmgr_test_service/BUILD.gn | 3 +++ services/abilitymgr/test/mock/libs/aakit/BUILD.gn | 5 ++++- .../test/mock/libs/appexecfwk_core/BUILD.gn | 6 ++++++ .../abilitymgr/test/mock/libs/arkui_mock/BUILD.gn | 3 +++ services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn | 3 +++ .../phone/data_ability_manager_test/BUILD.gn | 1 - .../phone/data_ability_record_test/BUILD.gn | 1 - .../unittest/phone/pending_want_key_test/BUILD.gn | 5 +---- services/appmgr/BUILD.gn | 1 - services/appmgr/test/BUILD.gn | 3 +++ .../ams_ability_running_record_test/BUILD.gn | 2 -- .../test/unittest/ams_app_mgr_client_test/BUILD.gn | 3 --- .../unittest/ams_app_running_record_test/BUILD.gn | 3 --- .../test/unittest/ams_ipc_interface_test/BUILD.gn | 6 ++++-- .../test/unittest/ams_mgr_scheduler_test/BUILD.gn | 3 --- .../ams_service_app_spawn_client_test/BUILD.gn | 3 +++ .../app_running_processes_info_test/BUILD.gn | 2 -- .../test/moduletest/ability_record_test/BUILD.gn | 1 - services/test/moduletest/common/ams/BUILD.gn | 3 +++ .../moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn | 2 -- .../moduletest/ipc_ability_scheduler_test/BUILD.gn | 5 +---- test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn | 2 +- .../fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn | 2 +- .../abilitySrc/amsAbilityAppendTestA/BUILD.gn | 2 -- .../abilitySrc/amsAbilityAppendTestB/BUILD.gn | 2 -- .../abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn | 2 -- .../amsAbilityVisibleTestServiceB/BUILD.gn | 2 -- .../amsConfigurationUpdatedSingletonTest/BUILD.gn | 2 -- .../abilitySrc/amsConfigurationUpdatedTest/BUILD.gn | 2 -- .../abilitySrc/amsDataSystemTestA/BUILD.gn | 2 -- .../abilitySrc/amsDataSystemTestB/BUILD.gn | 2 -- .../abilitySrc/amsDataSystemTestC/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestA/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestB/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestDataA/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestDataB/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestPageA/BUILD.gn | 2 -- .../abilitySrc/amsKitSystemTestService/BUILD.gn | 2 -- .../abilitySrc/amsStDataAbility/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestA/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestB/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestC/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestD/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestDFX/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestE/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestErrorK/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestErrorL/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestF/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestG/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestH/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestI/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestM/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestN/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestO/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestP/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestQ/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestR/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceA/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceB/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceC/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceD/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceE/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceF/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceG/BUILD.gn | 2 -- .../abilitySrc/amsSystemTestServiceH/BUILD.gn | 2 -- .../abilitySrc/fwkAbilityState/BUILD.gn | 2 -- .../ams/ams_ability_state_age_manual_test/BUILD.gn | 2 -- .../common/ams/ams_ability_state_test/BUILD.gn | 2 -- .../common/ams/ams_check_service/BUILD.gn | 2 -- tools/aa/BUILD.gn | 1 - tools/fm/BUILD.gn | 2 +- 84 files changed, 56 insertions(+), 161 deletions(-) rename figures/{aafwk.png => ability.png} (100%) diff --git a/README_zh.md b/README_zh.md index 2defecc25c..873318d84c 100644 --- a/README_zh.md +++ b/README_zh.md @@ -4,7 +4,7 @@ **元能力子系统**实现对Ability的运行及生命周期进行统一的调度和管理，应用进程能够支撑多个Ability，Ability具有跨应用进程间和同一进程内调用的能力。Ability管理服务统一调度和管理应用中各Ability，并对Ability的生命周期变更进行管理。 -![](figures/aafwk.png) +![](figures/ability.png) **元能力子系统架构图说明：** diff --git a/ability_runtime.gni b/ability_runtime.gni index ea1fca1949..9d4e90e418 100644 --- a/ability_runtime.gni +++ b/ability_runtime.gni @@ -36,7 +36,7 @@ ans_core_path = "${notification_path}/distributed_notification_service/frameworks/core" distributeddatamgr_path = "//foundation/distributeddatamgr" form_fwk_napi_path = "${form_fwk_path}/frameworks/js/napi" -ability_base_innerapi_path = "${ability_base_path}/interfaces/inner_api" +ability_base_kits_path = "${ability_base_path}/interfaces/kits/native" ability_base_native_path = "${ability_base_path}/frameworks/native" appspawn_path = "//base/startup/appspawn" init_path = "//base/startup/init_lite" diff --git a/figures/aafwk.png b/figures/ability.png similarity index 100% rename from figures/aafwk.png rename to figures/ability.png diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index f7f8307072..03a84f5b78 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -29,8 +29,6 @@ config("module_private_config") { "${ability_runtime_path}/frameworks/kits/appkit/native/test/mock/include", "${ability_runtime_path}/services/abilitymgr/include", "${ability_runtime_path}/services/common/include", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", ] @@ -55,12 +53,9 @@ config("module_ability_context_config") { visibility = [ ":*" ] include_dirs = [ "${ability_runtime_innerkits_path}/app_manager/include/appmgr", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_kits_path}/ability/native/test/mock/include", "${ability_runtime_kits_path}/appkit/native/test/mock/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/base/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/googletest/googlemock/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", diff --git a/frameworks/kits/appkit/native/test/BUILD.gn b/frameworks/kits/appkit/native/test/BUILD.gn index 2563e1647e..23d9807517 100644 --- a/frameworks/kits/appkit/native/test/BUILD.gn +++ b/frameworks/kits/appkit/native/test/BUILD.gn @@ -23,8 +23,6 @@ config("module_private_config") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "${ability_runtime_path}/interfaces/inner_api/app_manager/include/appmgr", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_path}/frameworks/kits/appkit/native/test/mock/include", "${ability_runtime_path}/frameworks/kits/ability/native/test/mock/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", @@ -44,8 +42,6 @@ config("module_context_config") { visibility = [ ":*" ] include_dirs = [ "${ability_runtime_innerkits_path}/app_manager/include/appmgr", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_path}/frameworks/kits/appkit/native/test/mock/include", "${ability_runtime_path}/frameworks/kits/ability/native/test/mock/include", "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", @@ -274,10 +270,7 @@ ohos_unittest("ability_start_setting_test") { ohos_unittest("watchdog_test") { module_out_path = module_output_path - include_dirs = [ - "${ability_base_innerapi_path}/want/include", - "//third_party/json/include", - ] + include_dirs = [ "//third_party/json/include" ] configs = [ ":module_context_config", @@ -295,6 +288,7 @@ ohos_unittest("watchdog_test") { external_deps = [ "ability_base:base", + "ability_base:want", "bundle_framework:appexecfwk_base", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/frameworks/kits/appkit/test/BUILD.gn b/frameworks/kits/appkit/test/BUILD.gn index 7bc0dda7bb..1b13df8585 100644 --- a/frameworks/kits/appkit/test/BUILD.gn +++ b/frameworks/kits/appkit/test/BUILD.gn @@ -21,10 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "${ability_runtime_innerkits_path}/app_manager/include/appmgr", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_kits_path}/appkit/native/test/mock/include", - - #"${ability_runtime_path}/frameworks/kits/ability/native/test/mock/include", "${ability_runtime_path}/frameworks/kits/appkit/test/Mock/include", "${ability_runtime_path}/interfaces/kits/native/appkit/app", ] diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index 40d8188a70..d18e2304ef 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -26,7 +26,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_kits_path}/test/mock/AMS", @@ -42,7 +41,6 @@ config("module_private_config") { ohos_moduletest("ability_moduletest") { module_out_path = module_output_path sources = [ - "${ability_base_path}/frameworks/native/configuration/src/configuration.cpp", "${ability_runtime_kits_path}/ability/native/test/mock/include/mock_bundle_manager.cpp", "${ability_runtime_kits_path}/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "${ability_runtime_kits_path}/test/mock/AMS/mock_ability_manager_client.cpp", @@ -72,7 +70,6 @@ ohos_moduletest("ability_moduletest") { configs = [ ":module_private_config", - "${ability_base_path}:want_public_config", "${ability_runtime_path}/frameworks/native/ability/native:ability_config", ] @@ -92,6 +89,7 @@ ohos_moduletest("ability_moduletest") { external_deps = [ "ability_base:base", + "ability_base:configuration", "ability_base:want", "ability_base:zuri", "bundle_framework:appexecfwk_base", @@ -131,7 +129,6 @@ ohos_moduletest("ability_conetxt_test") { configs = [ ":module_private_config", - "${ability_base_path}:want_public_config", "${ability_runtime_path}/frameworks/native/ability/native:ability_config", ] @@ -227,7 +224,6 @@ ohos_moduletest("data_ability_operation_moduletest") { configs = [ ":module_private_config", - "${ability_base_path}:want_public_config", "${ability_runtime_path}/frameworks/native/ability/native:ability_config", ] @@ -279,7 +275,6 @@ ohos_moduletest("data_ability_helper_module_test") { configs = [ ":module_private_config", - "${ability_base_path}:want_public_config", "${ability_runtime_path}/frameworks/native/ability/native:ability_config", ] diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index b3f90f132c..fa56efa499 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -54,7 +54,7 @@ config("appkit_config") { config("appkit_public_config") { visibility = [ ":*" ] include_dirs = [ - "${ability_base_innerapi_path}/configuration/include", + "${ability_base_kits_path}/configuration/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator", "${global_path}/resource_management/interfaces/inner_api/include", ] diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 0ab15d12d3..ac45efcf40 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -19,16 +19,16 @@ config("ability_manager_public_config") { include_dirs = [ "include/", "//base/notification/eventhandler/interfaces/inner_api", - "${ability_base_innerapi_path}/configuration/include", - "${ability_base_innerapi_path}/uri/include", - "//third_party/jsoncpp/include", - "${ability_base_innerapi_path}/want/include", + "${ability_base_kits_path}/configuration/include", + "${ability_base_kits_path}/uri/include", + "${ability_base_kits_path}/want/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", "${bundlefwk_inner_api_path}/appexecfwk_base/include", "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "//third_party/jsoncpp/include", ] defines = [ "ABILITY_COMMAND_FOR_TEST" ] diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index cb92ed4d17..a1cec3b83e 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -17,8 +17,8 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") config("appmgr_sdk_config") { include_dirs = [ "include/appmgr", - "${ability_base_innerapi_path}/configuration/include", - "${ability_base_innerapi_path}/want/include", + "${ability_base_kits_path}/configuration/include", + "${ability_base_kits_path}/want/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/log/include", diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index e465e2b2de..82855a0f7a 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -23,7 +23,7 @@ config("wantagent_innerkits_public_config") { include_dirs = [ "//base/notification/eventhandler/interfaces/inner_api", - "${ability_base_innerapi_path}/configuration/include", + "${ability_base_kits_path}/configuration/include", "${global_path}/resource_management/interfaces/inner_api/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_innerkits_path}/ability_manager/include", diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 453369edd6..c73636bd31 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -29,9 +29,9 @@ config("abilityms_config") { "include/", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/app_manager/include", - "${ability_base_innerapi_path}/base/include", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", + "${ability_base_path}/interfaces/inner_api/base/include", + "${ability_base_kits_path}/uri/include", + "${ability_base_kits_path}/want/include", "${ability_runtime_services_path}/common/include", "//prebuilts/jdk/jdk8/linux-x86/include", "//prebuilts/jdk/jdk8/linux-x86/include/linux", diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index d32bbf6365..b62a0f2924 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -158,6 +158,9 @@ ohos_source_set("abilityms_test_source") { if (ability_runtime_graphics) { external_deps += [ "window_manager:libdm" ] } + + subsystem_name = "ability" + part_name = "ability_runtime" } group("unittest") { diff --git a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn index 87425139e5..b4de5614fb 100644 --- a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn +++ b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn @@ -58,4 +58,7 @@ ohos_source_set("appmgr_test_service") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } diff --git a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn index cbcea5f0ab..1f0c156887 100644 --- a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn @@ -18,7 +18,6 @@ config("aakit_mock_config") { include_dirs = [ "${ability_runtime_services_path}/abilitymgr/test/mock/libs/aakit/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_path}/services/abilitymgr/include", "${ability_runtime_path}/interfaces/inner_api/app_manager/include", "${ability_runtime_path}/interfaces/kits/native/ability/native/", @@ -49,10 +48,14 @@ ohos_source_set("aakit_mock") { external_deps = [ "ability_base:base", "ability_base:configuration", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn index 06ac0a537b..9d16cb5d61 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn @@ -50,6 +50,9 @@ ohos_source_set("appexecfwk_appmgr_mock") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_source_set("appexecfwk_bundlemgr_mock") { @@ -80,4 +83,7 @@ ohos_source_set("appexecfwk_bundlemgr_mock") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } diff --git a/services/abilitymgr/test/mock/libs/arkui_mock/BUILD.gn b/services/abilitymgr/test/mock/libs/arkui_mock/BUILD.gn index 4919463f56..91dc0e415e 100644 --- a/services/abilitymgr/test/mock/libs/arkui_mock/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/arkui_mock/BUILD.gn @@ -49,4 +49,7 @@ ohos_source_set("arkui_mock") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } diff --git a/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn b/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn index e1a1005419..68e8ba0c12 100644 --- a/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn @@ -41,4 +41,7 @@ ohos_source_set("sa_mgr_mock") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } diff --git a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn index da9ee4585d..210b270d4e 100644 --- a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn @@ -36,7 +36,6 @@ ohos_unittest("data_ability_manager_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config", - "${ability_base_path}:base_public_config", "${ability_runtime_services_path}/abilitymgr/test/mock:aafwk_mock_config", ] cflags = [] diff --git a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn index 406174b3a4..b25fb5a49e 100644 --- a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn @@ -35,7 +35,6 @@ ohos_unittest("data_ability_record_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config", - "${ability_base_path}:base_public_config", "${ability_runtime_services_path}/abilitymgr/test/mock:aafwk_mock_config", ] cflags = [] diff --git a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn index ed85006894..10133ce6b7 100644 --- a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn @@ -19,10 +19,7 @@ module_output_path = "ability_runtime/abilitymgr" ohos_unittest("pending_want_key_test") { module_out_path = module_output_path - include_dirs = [ - "${ability_runtime_services_path}/abilitymgr/include", - "${ability_base_innerapi_path}/want/include", - ] + include_dirs = [ "${ability_runtime_services_path}/abilitymgr/include" ] sources = [ "${ability_runtime_services_path}/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index 0c07948a6e..19e9b66ae1 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -17,7 +17,6 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") config("appmgr_config") { include_dirs = [ "include", - "${ability_base_innerapi_path}/configuration/include", "${ability_runtime_services_path}/common/include", "${appspawn_path}/interfaces/innerkits/include", "${ability_runtime_path}/tools/aa/include", diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 449401fca9..d867421b01 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -90,6 +90,9 @@ ohos_source_set("appmgr_test_source") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } group("unittest") { diff --git a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn index 75626b2858..9784fa84fe 100644 --- a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn @@ -20,9 +20,7 @@ ohos_unittest("AmsAbilityRunningRecordTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/app_manager/inclide", - "${ability_base_innerapi_path}/uri/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", ] diff --git a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn index eaf07b2a59..1e81db1bda 100644 --- a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn @@ -27,9 +27,6 @@ ohos_unittest("AmsAppMgrClientTest") { sources += [ "ams_app_mgr_client_test.cpp" ] include_dirs = [ - "${ability_base_innerapi_path}/want/include/", - "${ability_base_path}/include/", - "${ability_base_innerapi_path}/uri/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include/", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", ] diff --git a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn index 7046b66094..a3272c2747 100644 --- a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn @@ -20,11 +20,8 @@ ohos_unittest("AmsAppRunningRecordTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", - "${ability_base_innerapi_path}/want/include", ] sources = [ diff --git a/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn b/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn index cb640f6794..c747caa2fb 100644 --- a/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn @@ -19,9 +19,9 @@ module_output_path = "ability_runtime/appmgrservice" ohos_unittest("AmsIpcAppSchedulerInterfaceTest") { module_out_path = module_output_path - include_dirs = [ "${ability_base_innerapi_path}/want/include" ] + include_dirs = [] - configs = [ "${ability_base_path}:want_public_config" ] + configs = [] sources = [ "ams_ipc_appscheduler_interface_test.cpp" ] cflags = [] @@ -31,7 +31,9 @@ ohos_unittest("AmsIpcAppSchedulerInterfaceTest") { deps = [ "${ability_runtime_services_path}/appmgr/test:appmgr_test_source" ] external_deps = [ + "ability_base:base", "ability_base:configuration", + "ability_base:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn index 83788fc8e9..e29e97e153 100644 --- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn @@ -20,11 +20,8 @@ ohos_unittest("AmsMgrSchedulerTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_services_path}/appmgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", - "${ability_base_innerapi_path}/want/include", ] sources = diff --git a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn index ef66ca806a..02fae994c3 100644 --- a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn @@ -70,6 +70,9 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + subsystem_name = "ability" + part_name = "ability_runtime" } group("unittest") { diff --git a/services/appmgr/test/unittest/app_running_processes_info_test/BUILD.gn b/services/appmgr/test/unittest/app_running_processes_info_test/BUILD.gn index c0563df818..1356417947 100644 --- a/services/appmgr/test/unittest/app_running_processes_info_test/BUILD.gn +++ b/services/appmgr/test/unittest/app_running_processes_info_test/BUILD.gn @@ -20,10 +20,8 @@ ohos_unittest("AppRunningProcessesInfoTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "${ability_base_innerapi_path}/want/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", - "${ability_base_innerapi_path}/want/include", ] sources = [ diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index a553188788..db4d869265 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -64,7 +64,6 @@ ohos_moduletest("AbilityRecordModuleTest") { configs = [ "${ability_runtime_services_path}/test:aafwk_module_test_config", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_config", - "${ability_base_path}:want_public_config", ] cflags = [] if (target_cpu == "arm") { diff --git a/services/test/moduletest/common/ams/BUILD.gn b/services/test/moduletest/common/ams/BUILD.gn index 318c296a84..1950f44276 100644 --- a/services/test/moduletest/common/ams/BUILD.gn +++ b/services/test/moduletest/common/ams/BUILD.gn @@ -99,6 +99,9 @@ ohos_source_set("appmgr_mst_source") { cflags_cc += [ "-DOS_ACCOUNT_PART_ENABLED" ] public_deps += [ "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits" ] } + + subsystem_name = "ability" + part_name = "ability_runtime" } group("moduletest") { diff --git a/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn b/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn index b3f1bd776e..b9b9941afe 100644 --- a/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn +++ b/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn @@ -20,8 +20,6 @@ ohos_moduletest("AmsIpcAmsmgrModuleTest") { module_out_path = module_output_path include_dirs = [ - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_services_path}/appmgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", ] diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index 7bf385f292..9ca2dda761 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -33,10 +33,7 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { sources += [ "ipc_ability_scheduler_module_test.cpp" ] - configs = [ - "${ability_runtime_services_path}/test:aafwk_module_test_config", - "${ability_base_path}:want_public_config", - ] + configs = [ "${ability_runtime_services_path}/test:aafwk_module_test_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn index b5567f9b8f..24fcad7307 100644 --- a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn +++ b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn @@ -25,7 +25,7 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") { fuzz_config_file = "${ability_runtime_path}/test/fuzztest/wantagenthelperstring_fuzzer" - include_dirs = [ "${ability_base_innerapi_path}/wantagent/include" ] + include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] cflags = [ "-g", diff --git a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn index 5c50a53baa..fa01208e04 100644 --- a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn +++ b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn @@ -25,7 +25,7 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") { fuzz_config_file = "${ability_runtime_path}/test/fuzztest/wantagenthelpertrigger_fuzzer" - include_dirs = [ "${ability_base_innerapi_path}/wantagent/include" ] + include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] cflags = [ "-g", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn index 89f6de584e..ce04f77319 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn @@ -20,8 +20,6 @@ config("amsAbilityAppendTestAConfig") { "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/want/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn index d845b3264e..a3d6c57250 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn @@ -20,8 +20,6 @@ config("amsAbilityAppendTestBConfig") { "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn index 8ed00b5247..d272f86064 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn @@ -20,9 +20,7 @@ config("amsAbilityVisibleTestPageAConfig") { "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${ability_runtime_path}/frameworks/kits/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn index cea97da7fe..70156ad4cc 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn @@ -19,9 +19,7 @@ config("amsAbilityVisibleTestServiceBConfig") { "${SUBDEMOSYSTEM_DIR}/include", "${notification_path}/ans_standard/interfaces/innerkits/wantagent/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${ability_runtime_path}/services/abilitymgr/include", "${ability_runtime_path}/services/common/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn index bc40b95d49..ac1bc502cf 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn @@ -18,9 +18,7 @@ config("amsConfigurationUpdatedSingletonTestConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn index b4c11215d1..2ce9ed6700 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn @@ -19,9 +19,7 @@ config("amsConfigurationUpdatedTestConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn index 9e255bb84d..eb4af7e1b6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn @@ -20,9 +20,7 @@ config("amsDataSystemTestAConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index e39f5b4c07..3cd859871e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -20,9 +20,7 @@ config("amsDataSystemTestBConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index 49fc6a1566..ac288debc7 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -20,9 +20,7 @@ config("amsDataSystemTestCConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn index d5cab71a9a..35313098c7 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn @@ -19,9 +19,7 @@ config("amsKitSystemTestAConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn index 907cc6543c..5b11e4e684 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn @@ -19,9 +19,7 @@ config("amsKitSystemTestBConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn index fe8e134e2b..7ed109a319 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn @@ -20,9 +20,7 @@ config("amsKitSystemTestDataAConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn index 3b0317599e..90eecc9f2c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn @@ -20,9 +20,7 @@ config("amsKitSystemTestDataBConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/bundlemgr/include", "${ability_runtime_services_path}/abilitymgr/include", "${common_path}/log/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn index 6019eeb19f..a5cae6264e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn index 63429dfe25..85aea1a274 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn @@ -20,8 +20,6 @@ config("amsKitSystemTestServiceconfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_kits_path}/appkit/native/app", diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn index 1c64c21619..b50c53a989 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn @@ -21,9 +21,7 @@ config("verify_act_ability_config") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn index 3a3a9fbed6..36a3009568 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestAConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn index a5ab18959d..7be1f92090 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestBConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn index addffc43f4..8bca8967d0 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn index 4b32ceb019..e6c5d1d4a1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestDConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn index 747f6d3faa..2db98ebd4e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn index c10960174c..cd721e5a99 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestEConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn index 650411e99c..2d7a105633 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn @@ -18,9 +18,7 @@ config("amsSystemTestErrorKConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn index 0e2324c198..d537a01d3d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn @@ -18,9 +18,7 @@ config("amsSystemTestErrorLConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn index 5a17a95339..d68edde58a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestFConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn index 8da87a1654..3e5d4ae58b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestGConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn index 771bc7f62a..6ad7f38e1d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestHConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn index 863898f2f4..f730d62cd7 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestIConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn index 1450702158..8dd0e652ae 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestMConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn index 4074e2ebd4..109a510f94 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestNConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn index d2c3991536..f9b2c55a24 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestOConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn index a6fbe25f59..33894a707e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestPConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn index 2f81f5cecf..9ae09cc529 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestQConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn index 4a9484788d..3bb87f4dfc 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn @@ -19,9 +19,7 @@ config("amsSystemTestRConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${SUBST_TOOLS_DIR}/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn index fb0cc2cc8a..96443d4f23 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn index 5172bf636a..8b2f916cd9 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn index 414821bb91..6b9527ae1b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn index 6864b896d8..b9cacecca2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn index 69f7d02f80..0baf4b1dca 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn index b40198ca69..75c16491e6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn index 1ac17af41a..282ec5eab6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn index b46e425442..4129401097 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn @@ -20,9 +20,7 @@ config("amsSystemTestCConfig") { include_dirs = [ "${subdemosystem_path}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "//third_party/jsoncpp/include", diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn index b6c6787630..a1ae2e4615 100644 --- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn @@ -18,9 +18,7 @@ config("amsSystemTestAConfig") { include_dirs = [ "${APP_DIR}/include", "${ability_runtime_kits_path}/appkit/native/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_innerkits_path}/ability_manager/include", - "${ability_base_innerapi_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${TOOLS_DIR}/include", diff --git a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn index 9f0058adb9..73c7713f5c 100644 --- a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn @@ -18,10 +18,8 @@ module_output_path = "appexecfwk_standard/ams/" config("system_test_ams_ability_state_age_manual_test_config") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_path}/interfaces/inner_api/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/ability/native", - "${ability_base_innerapi_path}/want/include", "//third_party/json/include", ] cflags = [] diff --git a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn index 322e56dbe8..2737defa72 100644 --- a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn @@ -18,10 +18,8 @@ module_output_path = "appexecfwk_standard/ams/" config("system_test_ams_ability_state_test_config") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_path}/interfaces/inner_api/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/ability/native", - "${ability_base_innerapi_path}/want/include", "//third_party/json/include", ] cflags = [] diff --git a/test/systemtest/common/ams/ams_check_service/BUILD.gn b/test/systemtest/common/ams/ams_check_service/BUILD.gn index 00f324de81..adbe816b30 100644 --- a/test/systemtest/common/ams/ams_check_service/BUILD.gn +++ b/test/systemtest/common/ams/ams_check_service/BUILD.gn @@ -18,10 +18,8 @@ module_output_path = "appexecfwk_standard/ams/" config("ams_check_service_config") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/app", - "${ability_base_innerapi_path}/want/include", "${ability_runtime_path}/interfaces/inner_api/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/ability/native", - "${ability_base_innerapi_path}/want/include", "//third_party/json/include", ] cflags = [] diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index f36302f6fe..a2b1e0c36e 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -18,7 +18,6 @@ config("ability_command_config") { include_dirs = [ "include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", - "${ability_runtime_innerkits_path}/uri/include", "${ability_runtime_services_path}/abilitymgr/include", "${bundlefwk_inner_api_path}/appexecfwk_base/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", diff --git a/tools/fm/BUILD.gn b/tools/fm/BUILD.gn index 1caec5a564..4d02a98037 100644 --- a/tools/fm/BUILD.gn +++ b/tools/fm/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") config("tools_fm_config") { include_dirs = [ - "${ability_base_innerapi_path}/want/include", + "${ability_base_kits_path}/want/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_path}/tools/aa/include", "${ability_runtime_services_path}/common/include",