From f23860c2842e1a44c2e352759f3736b93a4c5ed5 Mon Sep 17 00:00:00 2001 From: wx1094762 Date: Fri, 22 Apr 2022 15:42:50 +0800 Subject: [PATCH] =?UTF-8?q?aafwk=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wx1094762 Change-Id: I0c031c50d1f4614bf9566182ba3556375e8a1a18 --- aafwk.gni | 7 + common/task_dispatcher/test/BUILD.gn | 4 +- .../ability_runtime/test/moduletest/BUILD.gn | 28 +- .../ability_runtime/test/unittest/BUILD.gn | 80 +- frameworks/kits/ability/native/BUILD.gn | 22 +- frameworks/kits/ability/native/test/BUILD.gn | 761 +++++++++--------- frameworks/kits/appkit/BUILD.gn | 16 +- frameworks/kits/appkit/native/test/BUILD.gn | 157 ++-- frameworks/kits/appkit/test/BUILD.gn | 99 +-- frameworks/kits/base/cpp/test/BUILD.gn | 6 +- frameworks/kits/content/cpp/test/BUILD.gn | 63 +- frameworks/kits/test/BUILD.gn | 293 +++---- frameworks/kits/wantagent/BUILD.gn | 2 +- .../completed_dispatcher_test/BUILD.gn | 8 +- .../test/unittest/pending_want_test/BUILD.gn | 12 +- .../test/unittest/trigger_Info_test/BUILD.gn | 8 +- .../unittest/want_agent_helper_test/BUILD.gn | 12 +- .../unittest/want_agent_info_test/BUILD.gn | 8 +- .../test/unittest/want_agent_test/BUILD.gn | 8 +- idl/test/native/BUILD.gn | 3 +- interfaces/innerkits/ability_manager/BUILD.gn | 5 +- interfaces/kits/napi/BUILD.gn | 85 +- services/abilitymgr/BUILD.gn | 10 +- services/abilitymgr/test/BUILD.gn | 26 +- .../test/mock/appmgr_test_service/BUILD.gn | 24 +- .../abilitymgr/test/mock/libs/aakit/BUILD.gn | 24 +- .../test/mock/libs/appexecfwk_core/BUILD.gn | 32 +- .../abilitymgr/test/mock/libs/sa_mgr/BUILD.gn | 4 +- .../BUILD.gn | 12 +- .../BUILD.gn | 12 +- .../ability_connect_manage_test/BUILD.gn | 18 +- .../ability_manager_client_test/BUILD.gn | 18 +- .../phone/ability_manager_proxy_test/BUILD.gn | 20 +- .../BUILD.gn | 18 +- .../phone/ability_manager_stub_test/BUILD.gn | 16 +- .../phone/ability_record_test/BUILD.gn | 30 +- .../ability_scheduler_proxy_test/BUILD.gn | 16 +- .../ability_scheduler_stub_test/BUILD.gn | 14 +- .../phone/ability_service_start_test/BUILD.gn | 14 +- .../phone/ability_timeout_test/BUILD.gn | 20 +- .../phone/ability_token_proxy_test/BUILD.gn | 14 +- .../phone/ability_token_stub_test/BUILD.gn | 14 +- .../phone/app_scheduler_test/BUILD.gn | 12 +- .../phone/call_container_test/BUILD.gn | 12 +- .../phone/configuration_test/BUILD.gn | 20 +- .../phone/connection_record_test/BUILD.gn | 14 +- .../phone/data_ability_manager_test/BUILD.gn | 22 +- .../phone/data_ability_record_test/BUILD.gn | 24 +- .../phone/lifecycle_deal_test/BUILD.gn | 16 +- .../unittest/phone/lifecycle_test/BUILD.gn | 14 +- .../phone/mission_list_dump_test/BUILD.gn | 2 +- .../phone/mission_list_manager_test/BUILD.gn | 14 +- .../mission_list_manager_ut_test/BUILD.gn | 12 +- .../unittest/phone/mission_list_test/BUILD.gn | 26 +- .../test/unittest/phone/mission_test/BUILD.gn | 14 +- .../phone/pending_want_key_test/BUILD.gn | 18 +- .../phone/pending_want_manager_test/BUILD.gn | 14 +- .../phone/pending_want_record_test/BUILD.gn | 14 +- .../phone/running_infos_test/BUILD.gn | 18 +- .../phone/screenshot_handler_test/BUILD.gn | 22 +- .../unittest/phone/sender_info_test/BUILD.gn | 14 +- .../specified_mission_list_test/BUILD.gn | 14 +- .../start_option_display_id_test/BUILD.gn | 20 +- .../phone/want_receiver_proxy_test/BUILD.gn | 14 +- .../phone/want_receiver_stub_test/BUILD.gn | 14 +- .../phone/want_sender_info_test/BUILD.gn | 14 +- .../phone/want_sender_proxy_test/BUILD.gn | 14 +- .../phone/want_sender_stub_test/BUILD.gn | 14 +- .../unittest/phone/wants_info_test/BUILD.gn | 14 +- services/appmgr/examples/BUILD.gn | 11 +- services/appmgr/test/BUILD.gn | 12 +- .../ams_ability_running_record_test/BUILD.gn | 16 +- .../ams_app_death_recipient_test/BUILD.gn | 10 +- .../unittest/ams_app_life_cycle_test/BUILD.gn | 10 +- .../unittest/ams_app_mgr_client_test/BUILD.gn | 10 +- .../ams_app_running_record_test/BUILD.gn | 12 +- .../unittest/ams_app_workflow_test/BUILD.gn | 8 +- .../unittest/ams_ipc_interface_test/BUILD.gn | 8 +- .../unittest/ams_mgr_scheduler_test/BUILD.gn | 14 +- .../ams_recent_app_list_test/BUILD.gn | 10 +- .../BUILD.gn | 8 +- .../ams_service_event_drive_test/BUILD.gn | 12 +- .../BUILD.gn | 8 +- .../ams_service_startup_test/BUILD.gn | 10 +- .../app_mgr_service_dump_test/BUILD.gn | 2 +- .../BUILD.gn | 10 +- .../app_running_processes_info_test/BUILD.gn | 12 +- .../data_ability_observer_proxy_test/BUILD.gn | 10 +- .../data_ability_observer_stub_test/BUILD.gn | 10 +- .../phone/dataobs_mgr_client_test/BUILD.gn | 12 +- .../phone/dataobs_mgr_inner_test/BUILD.gn | 10 +- .../phone/dataobs_mgr_proxy_test/BUILD.gn | 8 +- .../phone/dataobs_mgr_service_test/BUILD.gn | 10 +- .../phone/dataobs_mgr_stub_test/BUILD.gn | 10 +- .../unittest/fms_form_cache_mgr_test/BUILD.gn | 26 +- .../unittest/fms_form_data_mgr_test/BUILD.gn | 26 +- .../unittest/fms_form_db_record_test/BUILD.gn | 22 +- .../fms_form_host_record_test/BUILD.gn | 32 +- .../unittest/fms_form_info_mgr_test/BUILD.gn | 32 +- .../fms_form_mgr_add_form_test/BUILD.gn | 34 +- .../fms_form_mgr_cast_temp_form_test/BUILD.gn | 34 +- .../fms_form_mgr_death_callback_test/BUILD.gn | 34 +- .../fms_form_mgr_delete_form_test/BUILD.gn | 34 +- .../BUILD.gn | 40 +- .../fms_form_mgr_message_event_test/BUILD.gn | 32 +- .../BUILD.gn | 40 +- .../BUILD.gn | 38 +- .../fms_form_mgr_release_form_test/BUILD.gn | 32 +- .../fms_form_mgr_request_form_test/BUILD.gn | 32 +- .../fms_form_mgr_update_form_test/BUILD.gn | 32 +- .../fms_form_provider_data_test/BUILD.gn | 20 +- .../fms_form_provider_mgr_test/BUILD.gn | 32 +- .../fms_form_set_next_refresh_test/BUILD.gn | 34 +- .../fms_form_sys_event_receiver_test/BUILD.gn | 38 +- .../unittest/fms_form_timer_mgr_test/BUILD.gn | 10 +- .../BUILD.gn | 22 +- .../moduletest/ability_record_test/BUILD.gn | 30 +- .../ability_timeout_module_test/BUILD.gn | 92 +-- .../test/moduletest/call_module_test/BUILD.gn | 22 +- services/test/moduletest/common/ams/BUILD.gn | 18 +- .../common/ams/app_life_cycle_test/BUILD.gn | 2 +- .../common/ams/app_mgr_service_test/BUILD.gn | 4 +- .../common/ams/ipc_ams_mgr_test/BUILD.gn | 10 +- .../service_app_spawn_client_test/BUILD.gn | 4 +- .../ams/service_event_drive_test/BUILD.gn | 2 +- .../ams/service_start_process_test/BUILD.gn | 2 +- .../specified_ability_service_test/BUILD.gn | 40 +- .../test/moduletest/dump_module_test/BUILD.gn | 22 +- .../ipc_ability_connect_test/BUILD.gn | 2 +- .../moduletest/ipc_ability_mgr_test/BUILD.gn | 6 +- .../ipc_ability_scheduler_test/BUILD.gn | 20 +- .../moduletest/mission_dump_test/BUILD.gn | 22 +- .../moduletest/module_test_dump_util/BUILD.gn | 4 +- .../on_new_want_module_test/BUILD.gn | 36 +- .../panding_want_manager_test/BUILD.gn | 36 +- .../running_infos_module_test/BUILD.gn | 88 +- .../start_option_display_id_test/BUILD.gn | 18 +- .../AcquireDataAbility_fuzzer/BUILD.gn | 16 +- .../CompelVerifyPermission_fuzzer/BUILD.gn | 12 +- test/fuzztest/FinishUserTest_fuzzer/BUILD.gn | 16 +- test/fuzztest/GetWantSender_fuzzer/BUILD.gn | 16 +- test/fuzztest/SetMissionLabel_fuzzer/BUILD.gn | 16 +- test/fuzztest/StartAbility_fuzzer/BUILD.gn | 16 +- .../StartContinuation_fuzzer/BUILD.gn | 16 +- .../StopServiceAbility_fuzzer/BUILD.gn | 14 +- .../UpdateConfiguration_fuzzer/BUILD.gn | 12 +- .../WantAgentHelperString_fuzzer/BUILD.gn | 4 +- .../WantAgentHelperTrigger_fuzzer/BUILD.gn | 4 +- .../amsAbilityVisibleTestPageA/BUILD.gn | 46 +- .../amsAbilityVisibleTestServiceB/BUILD.gn | 44 +- .../abilitySrc/amsDataSystemTestB/BUILD.gn | 38 +- .../abilitySrc/amsDataSystemTestC/BUILD.gn | 38 +- .../abilitySrc/amsStDataAbility/BUILD.gn | 34 +- .../abilitySrc/amsSystemTestA/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestB/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestC/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestD/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestDFX/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestE/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestErrorK/BUILD.gn | 34 +- .../abilitySrc/amsSystemTestErrorL/BUILD.gn | 34 +- .../abilitySrc/amsSystemTestF/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestG/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestH/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestI/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestM/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestN/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestO/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestP/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestQ/BUILD.gn | 36 +- .../abilitySrc/amsSystemTestR/BUILD.gn | 36 +- .../abilitySrc/fwkAbilityState/BUILD.gn | 36 +- .../abilitySrc/serviceAbilityA/BUILD.gn | 8 +- .../abilitySrc/taskDispatcherTestA/BUILD.gn | 6 +- .../abilitySrc/taskDispatcherTestB/BUILD.gn | 6 +- .../fmsSystemPerformance/BUILD.gn | 7 +- .../fmsSystemStress/BUILD.gn | 7 +- .../fmsSystemTestHostCommonA/BUILD.gn | 5 +- .../fmsSystemTestHostCommonB/BUILD.gn | 5 +- .../fmsSystemTestHostNoPerm/BUILD.gn | 7 +- .../fmsSystemTestHostNormal/BUILD.gn | 5 +- .../fmsSystemTestHostNormalB/BUILD.gn | 5 +- .../fmsSystemTestHostNormalC/BUILD.gn | 5 +- .../fmsSystemTestHostNotSys/BUILD.gn | 7 +- .../selfStartingTestHostA/BUILD.gn | 7 +- .../selfStartingTestHostB/BUILD.gn | 7 +- .../common/ams/ams_aa_command_test/BUILD.gn | 23 +- .../ams/ams_ability_append_test/BUILD.gn | 14 +- .../BUILD.gn | 23 +- .../ams/ams_ability_state_test/BUILD.gn | 23 +- .../ams/ams_ability_visible_test/BUILD.gn | 14 +- .../ams/ams_app_process_manage_test/BUILD.gn | 16 +- .../common/ams/ams_check_service/BUILD.gn | 23 +- .../ams_configuration_updated_test/BUILD.gn | 14 +- .../common/ams/ams_data_ability_test/BUILD.gn | 14 +- .../common/ams/ams_dfx_test/BUILD.gn | 14 +- .../ams/ams_service_ability_test/BUILD.gn | 16 +- test/systemtest/common/ams/tool/BUILD.gn | 29 +- .../common/fms/fms_acquire_form_test/BUILD.gn | 5 +- .../fms/fms_acquire_form_test_max/BUILD.gn | 5 +- .../common/fms/fms_delete_form_test/BUILD.gn | 5 +- .../common/fms/fms_fuzz_test/BUILD.gn | 5 +- .../common/fms/fms_performance_test/BUILD.gn | 5 +- .../common/fms/fms_release_form_test/BUILD.gn | 5 +- .../fms/fms_self_starting_test/BUILD.gn | 5 +- .../common/fms/fms_stress_test/BUILD.gn | 5 +- .../common/task_dispatcher/BUILD.gn | 29 +- tools/aa/BUILD.gn | 2 +- 208 files changed, 2667 insertions(+), 2574 deletions(-) diff --git a/aafwk.gni b/aafwk.gni index 258345a93c9..1d2322df305 100644 --- a/aafwk.gni +++ b/aafwk.gni @@ -14,6 +14,13 @@ import("//foundation/aafwk/standard/feature.gni") aafwk_path = "//foundation/aafwk/standard" appexecfwk_path = "//foundation/appexecfwk/standard" +distributedschedule_path = "//foundation/distributedschedule" +distributeddatamgr_path = "//foundation/distributeddatamgr" +multimodalinput_path = "//foundation/multimodalinput/input" +multimedia_path = "//foundation/multimedia" +windowmanager_path = "//foundation/windowmanager" +graphic_path = "//foundation/graphic" +global_path = "//base/global" services_path = "${aafwk_path}/services" diff --git a/common/task_dispatcher/test/BUILD.gn b/common/task_dispatcher/test/BUILD.gn index c27637c77d8..fb21cfde670 100644 --- a/common/task_dispatcher/test/BUILD.gn +++ b/common/task_dispatcher/test/BUILD.gn @@ -75,7 +75,9 @@ ohos_source_set("dispatcher_test_source") { "//utils/native/base:utils", ] - deps = [ "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler" ] + deps = [ + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } diff --git a/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn b/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn index 70564e8ab76..56c8df40e58 100644 --- a/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn +++ b/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn @@ -24,32 +24,32 @@ config("module_private_config") { cflags += [ "-DBINDER_IPC_32BIT" ] } include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS", - #"//foundation/distributedschedule/safwk/services/safwk/include", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS", + #""${distributedschedule_path}/safwk/services/safwk/include", ] } ohos_moduletest("ability_caller_fw_module_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "ability_caller_fw_module_test.cpp", ] configs = [ ":module_private_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/ability_runtime:ability_context_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/frameworks/kits/ability/ability_runtime/test/unittest/BUILD.gn b/frameworks/kits/ability/ability_runtime/test/unittest/BUILD.gn index 46ae2de1f21..4eba3e6c325 100644 --- a/frameworks/kits/ability/ability_runtime/test/unittest/BUILD.gn +++ b/frameworks/kits/ability/ability_runtime/test/unittest/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_out_path = "ability_runtime/ability_call_test" @@ -24,24 +25,25 @@ config("module_private_config") { ohos_unittest("ability_context_impl_ut_test") { module_out_path = module_out_path - include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] + include_dirs = + [ "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "ability_context_impl_ut_test.cpp", ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/ability_runtime:ability_context_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -52,8 +54,8 @@ ohos_unittest("caller_call_back_ut_test") { sources = [ "caller_call_back_ut_test.cpp" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/ability_runtime:ability_context_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "//third_party/googletest:gtest_main", ] } @@ -61,24 +63,25 @@ ohos_unittest("caller_call_back_ut_test") { ohos_unittest("local_call_container_ut_test") { module_out_path = module_out_path - include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] + include_dirs = + [ "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "local_call_container_ut_test.cpp", ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/ability_runtime:ability_context_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -87,24 +90,25 @@ ohos_unittest("local_call_container_ut_test") { ohos_unittest("local_call_record_ut_test") { module_out_path = module_out_path - include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] + include_dirs = + [ "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS" ] sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "local_call_record_ut_test.cpp", ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/ability_runtime:ability_context_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn index c9db76b38d8..0c9cd44d8fe 100644 --- a/frameworks/kits/ability/native/BUILD.gn +++ b/frameworks/kits/ability/native/BUILD.gn @@ -75,7 +75,7 @@ config("ability_public_config") { "${kits_path}/appkit/native/ability_runtime/context", "${innerkits_path}/base/include/ohos/aafwk/base", "${innerkits_path}/ability_manager/include/continuation", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", "//third_party/jsoncpp/include", "//third_party/json/include", ] @@ -84,8 +84,8 @@ config("ability_public_config") { include_dirs += [ "${kits_path}/fmskit/native/include", "${innerkits_path}/form_manager/include", - "//foundation/windowmanager/interfaces/innerkits/wm", - "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_stage_napi", + "${windowmanager_path}/interfaces/innerkits/wm", + "${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi", ] defines = [ "SUPPORT_GRAPHICS" ] } @@ -274,7 +274,7 @@ ohos_shared_library("abilitykit_native") { public_deps = [ "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/ace/napi:ace_napi", ] @@ -294,7 +294,7 @@ ohos_shared_library("abilitykit_native") { "src/page_ability_impl.cpp", ] deps += [ - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", + "${multimodalinput_path}/frameworks/proxy:libmmi-common", "//third_party/icu/icu4c:shared_icuuc", ] @@ -306,12 +306,12 @@ ohos_shared_library("abilitykit_native") { ] public_deps += [ - "//base/global/i18n/frameworks/intl:intl_util", - "//foundation/graphic/standard:libwmclient", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//foundation/windowmanager/dm:libdm", - "//foundation/windowmanager/interfaces/kits/napi/window_runtime:windowstage_kit", - "//foundation/windowmanager/wm:libwm", + "${global_path}/i18n/frameworks/intl:intl_util", + "${graphic_path}/standard:libwmclient", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", + "${windowmanager_path}/dm:libdm", + "${windowmanager_path}/interfaces/kits/napi/window_runtime:windowstage_kit", + "${windowmanager_path}/wm:libwm", ] } subsystem_name = "aafwk" diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index b9cd5c7d965..87579e6a1cb 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -12,37 +12,38 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/ability_test" -INNERKITS_PATH = "//foundation/aafwk/standard/interfaces/innerkits" +INNERKITS_PATH = "${aafwk_path}/interfaces/innerkits" ############################################################################### config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/services/common/include", - - "//foundation/aafwk/standard/common/task_dispatcher/include/dispatcher", - "//foundation/aafwk/standard/common/task_dispatcher/include/task", - "//foundation/aafwk/standard/common/task_dispatcher/include/threading", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include/task", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${aafwk_path}/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/services/common/include", + + "${aafwk_path}/common/task_dispatcher/include/dispatcher", + "${aafwk_path}/common/task_dispatcher/include/task", + "${aafwk_path}/common/task_dispatcher/include/threading", + "${aafwk_path}/frameworks/kits/appkit/native/app/include/task", ] cflags = [] if (target_cpu == "arm") { @@ -55,8 +56,8 @@ config("module_private_config") { if (ability_runtime_graphics) { include_dirs += [ - "//base/global/i18n/frameworks/intl/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", + "${global_path}/i18n/frameworks/intl/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", ] } } @@ -64,22 +65,22 @@ config("module_private_config") { config("module_ability_context_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/googletest/googlemock/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", + "${multimodalinput_path}/interfaces/native/innerkits/event/include", + "${aafwk_path}/interfaces/innerkits/base/include", "//third_party/libuv/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${aafwk_path}/interfaces/innerkits/base/include/ohos/aafwk/base", + "${global_path}/resmgr_standard/interfaces/innerkits/include", ] cflags = [] if (target_cpu == "arm") { @@ -94,11 +95,11 @@ config("module_ability_context_config") { ohos_unittest("ability_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ability_record_mgr.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ability_record_mgr.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "unittest/ability_test.cpp", ] @@ -107,17 +108,17 @@ ohos_unittest("ability_test") { deps = [ "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -133,7 +134,7 @@ ohos_unittest("ability_test") { ] if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } @@ -150,16 +151,16 @@ ohos_unittest("ability_lifecycle_test") { deps = [ "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -185,16 +186,16 @@ ohos_unittest("ability_lifecycle_executor_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -213,22 +214,23 @@ ohos_unittest("ability_context_for_task_dispacher_test") { module_out_path = module_output_path sources = [ "unittest/ability_context_for_task_dispacher_test.cpp" ] - include_dirs = [ "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include" ] + include_dirs = + [ "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include" ] configs = [ ":module_ability_context_config" ] deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -256,15 +258,15 @@ ohos_unittest("ability_context_interface_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -291,7 +293,7 @@ ohos_unittest("ability_context_test") { ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", + "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common", "//foundation/ace/napi/interfaces/kits", ] @@ -299,14 +301,14 @@ ohos_unittest("ability_context_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/ace/napi:ace_napi", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -326,8 +328,8 @@ ohos_unittest("page_ability_impl_test") { module_out_path = module_output_path if (ability_runtime_graphics) { sources = [ + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", "../src/page_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", "unittest/page_ability_impl_test.cpp", ] @@ -335,17 +337,17 @@ ohos_unittest("page_ability_impl_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", + "${multimodalinput_path}/frameworks/proxy:libmmi-common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -369,16 +371,16 @@ ohos_unittest("service_ability_impl_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -396,7 +398,7 @@ ohos_unittest("service_ability_impl_test") { ohos_unittest("scene_created_test") { module_out_path = module_output_path if (ability_runtime_graphics) { - include_dirs = [ "//foundation/windowmanager/interfaces/innerkits/wm" ] + include_dirs = [ "${windowmanager_path}/interfaces/innerkits/wm" ] configs = [ ":module_ability_context_config" ] @@ -404,16 +406,16 @@ ohos_unittest("scene_created_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -428,7 +430,7 @@ ohos_unittest("scene_created_test") { ohos_unittest("data_ability_helper_test") { module_out_path = module_output_path - include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] + include_dirs = [ "${aafwk_path}/services/abilitymgr/include" ] sources = [ "unittest/data_ability_helper_test.cpp" ] @@ -438,11 +440,11 @@ ohos_unittest("data_ability_helper_test") { "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -470,16 +472,16 @@ ohos_unittest("data_ability_operation_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -501,9 +503,9 @@ ohos_unittest("data_ability_operation_test") { ohos_unittest("ability_impl_active_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", ] configs = [ ":module_private_config" ] @@ -511,17 +513,17 @@ ohos_unittest("ability_impl_active_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -541,9 +543,9 @@ ohos_unittest("ability_impl_active_test") { ohos_unittest("ability_impl_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", ] configs = [ ":module_private_config" ] @@ -551,18 +553,18 @@ ohos_unittest("ability_impl_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -581,8 +583,8 @@ ohos_unittest("ability_impl_test") { if (ability_runtime_graphics) { sources += [ "unittest/ability_impl_test.cpp" ] deps += [ - "//base/global/i18n/frameworks/intl:intl_util", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", + "${global_path}/i18n/frameworks/intl:intl_util", + "${multimodalinput_path}/frameworks/proxy:libmmi-common", ] external_deps += [ "input:libmmi-client" ] } @@ -591,14 +593,14 @@ ohos_unittest("ability_impl_test") { ohos_unittest("ability_thread_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_data_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_deal.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_data_ability_impl.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_deal.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "mock/include/mock_ability_manager_client.cpp", "mock/include/sys_mgr_client_mock.cpp", "unittest/ability_thread_test.cpp", @@ -609,18 +611,18 @@ ohos_unittest("ability_thread_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -641,7 +643,7 @@ ohos_unittest("ability_thread_test") { } if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } @@ -649,8 +651,8 @@ ohos_unittest("ability_thread_test") { ohos_unittest("ability_thread_call_request_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "unittest/ability_thread_call_request_test.cpp", ] @@ -658,15 +660,15 @@ ohos_unittest("ability_thread_call_request_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", ] @@ -677,7 +679,7 @@ ohos_unittest("form_provider_client_test") { module_out_path = module_output_path if (ability_runtime_graphics) { include_dirs = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", ] @@ -690,18 +692,18 @@ ohos_unittest("form_provider_client_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", + "${graphic_path}/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -720,14 +722,14 @@ ohos_unittest("form_provider_client_test") { ohos_unittest("data_ability_impl_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_deal.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_deal.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "unittest/data_ability_impl_test.cpp", ] @@ -737,17 +739,17 @@ ohos_unittest("data_ability_impl_test") { "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -768,7 +770,7 @@ ohos_unittest("data_ability_impl_test") { } if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } @@ -776,14 +778,14 @@ ohos_unittest("data_ability_impl_test") { ohos_unittest("data_ability_impl_file_secondpart_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_deal.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_deal.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "unittest/data_ability_impl_file_secondpart_test.cpp", ] @@ -793,17 +795,17 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -824,7 +826,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { } if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } @@ -832,14 +834,14 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { ohos_unittest("data_ability_impl_file_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_deal.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_deal.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "unittest/data_ability_impl_file_test.cpp", ] @@ -849,17 +851,17 @@ ohos_unittest("data_ability_impl_file_test") { "${INNERKITS_PATH}/base:base", "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -880,7 +882,7 @@ ohos_unittest("data_ability_impl_file_test") { } if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } @@ -888,14 +890,14 @@ ohos_unittest("data_ability_impl_file_test") { ohos_unittest("ability_thread_dataability_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_data_ability_impl.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_deal.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_data_ability_impl.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_deal.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "mock/include/mock_ability_manager_client.cpp", "mock/include/sys_mgr_client_mock.cpp", "unittest/ability_thread_dataability_test.cpp", @@ -906,18 +908,18 @@ ohos_unittest("ability_thread_dataability_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -938,15 +940,14 @@ ohos_unittest("ability_thread_dataability_test") { } if (ability_runtime_graphics) { - deps += [ "//foundation/graphic/standard:libwmclient" ] + deps += [ "${graphic_path}/standard:libwmclient" ] external_deps += [ "input:libmmi-client" ] } } config("data_uri_utils_test_config") { visibility = [ ":*" ] - include_dirs = - [ "//foundation/aafwk/standard/frameworks/kits/ability/native/include/" ] + include_dirs = [ "${aafwk_path}/frameworks/kits/ability/native/include/" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -965,17 +966,17 @@ ohos_unittest("data_uri_utils_test") { ] sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/data_uri_utils.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/data_uri_utils_test.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/data_uri_utils.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/unittest/data_uri_utils_test.cpp", ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -992,15 +993,15 @@ ohos_unittest("data_uri_utils_test") { ohos_unittest("pac_map_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/pac_map_test.cpp" ] + sources = [ "${aafwk_path}/frameworks/kits/ability/native/test/unittest/pac_map_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -1018,7 +1019,7 @@ ohos_unittest("pac_map_test") { ohos_unittest("ability_permission_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/ability_permission_test.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/unittest/ability_permission_test.cpp", "mock/include/mock_ability_manager_service.cpp", "mock/include/mock_bundle_manager.cpp", "mock/include/sys_mgr_client_mock.cpp", @@ -1028,14 +1029,14 @@ ohos_unittest("ability_permission_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -1053,15 +1054,15 @@ ohos_unittest("ability_permission_test") { ohos_unittest("task_handler_client_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/task_handler_client_test.cpp" ] + sources = [ "${aafwk_path}/frameworks/kits/ability/native/test/unittest/task_handler_client_test.cpp" ] configs = [ ":module_private_config" ] deps = [ "${INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -1075,18 +1076,18 @@ ohos_unittest("task_handler_client_test") { ohos_unittest("ability_thread_for_ability_on_configuration_update") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/ability_thread_for_ability_on_configuration_update.cpp" ] + sources = [ "${aafwk_path}/frameworks/kits/ability/native/test/unittest/ability_thread_for_ability_on_configuration_update.cpp" ] configs = [ ":module_private_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -1103,14 +1104,14 @@ ohos_unittest("ability_thread_for_ability_on_configuration_update") { ohos_unittest("data_ability_result_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/data_ability_result_test.cpp" ] + sources = [ "${aafwk_path}/frameworks/kits/ability/native/test/unittest/data_ability_result_test.cpp" ] configs = [ ":module_private_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] @@ -1128,12 +1129,12 @@ ohos_unittest("form_host_client_test") { module_out_path = module_output_path if (ability_runtime_graphics) { sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ability_record_mgr.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_start_setting.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ability_record_mgr.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_start_setting.cpp", "mock/include/mock_bundle_manager_form.cpp", "unittest/form_host_client_test.cpp", ] @@ -1142,18 +1143,18 @@ ohos_unittest("form_host_client_test") { deps = [ "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", + "${graphic_path}/standard:libwmclient", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -1174,10 +1175,10 @@ ohos_unittest("form_host_client_test") { ohos_unittest("continuation_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/application_context.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/ohos_application.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "unittest/continuation_test.cpp", ] @@ -1186,17 +1187,17 @@ ohos_unittest("continuation_test") { deps = [ "${INNERKITS_PATH}/uri:zuri", "${INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn index 7b8d0719dbc..4522943f6a3 100644 --- a/frameworks/kits/appkit/BUILD.gn +++ b/frameworks/kits/appkit/BUILD.gn @@ -53,12 +53,12 @@ config("appkit_public_config") { visibility = [ ":*" ] include_dirs = [ "native/ability_delegator/include", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", ] if (ability_runtime_graphics) { include_dirs += [ - "//base/global/i18n/frameworks/intl/include", + "${global_path}/i18n/frameworks/intl/include", "//third_party/icu/icu4c/source/common", ] @@ -155,7 +155,7 @@ ohos_shared_library("appkit_native") { ] public_deps = - [ "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr" ] + [ "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr" ] external_deps = [ "ability_base:configuration", "ability_base:want", @@ -185,10 +185,10 @@ ohos_shared_library("appkit_native") { if (ability_runtime_graphics) { deps += [ - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "${multimodalinput_path}/frameworks/proxy:libmmi-client", "//third_party/icu/icu4c:shared_icuuc", ] - public_deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + public_deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } part_name = "ability_runtime" } @@ -223,7 +223,7 @@ ohos_shared_library("app_context") { ] public_deps = - [ "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr" ] + [ "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr" ] external_deps = [ "ability_base:want", @@ -250,10 +250,10 @@ ohos_shared_library("app_context") { if (ability_runtime_graphics) { deps += [ - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "${multimodalinput_path}/frameworks/proxy:libmmi-client", "//third_party/icu/icu4c:shared_icuuc", ] - public_deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + public_deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } part_name = "ability_runtime" } diff --git a/frameworks/kits/appkit/native/test/BUILD.gn b/frameworks/kits/appkit/native/test/BUILD.gn index 69b665ece03..22890f97a94 100644 --- a/frameworks/kits/appkit/native/test/BUILD.gn +++ b/frameworks/kits/appkit/native/test/BUILD.gn @@ -16,22 +16,22 @@ import("//foundation/aafwk/standard/aafwk.gni") import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/application_test" -#APP_INNERKITS_PATH = "//foundation/appexecfwk/standard/interfaces/innerkits" -ABILITY_INNERKITS_PATH = "//foundation/aafwk/standard/interfaces/innerkits" +#APP_INNERKITS_PATH = "${appexecfwk_path}/interfaces/innerkits" +ABILITY_INNERKITS_PATH = "${aafwk_path}/interfaces/innerkits" ############################################################################### config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/context", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/ability/native/include", "${aafwk_path}/common/task_dispatcher/include/dispatcher", "${aafwk_path}/common/task_dispatcher/include/task", "${aafwk_path}/common/task_dispatcher/include/threading", @@ -50,21 +50,21 @@ config("module_private_config") { config("module_context_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", "${aafwk_path}/common/task_dispatcher/include/dispatcher", "${aafwk_path}/common/task_dispatcher/include/task", "${aafwk_path}/common/task_dispatcher/include/threading", "${aafwk_path}/frameworks/kits/appkit/native/app/include/task", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/interfaces/innerkits/base/include", ] cflags = [] if (target_cpu == "arm") { @@ -88,13 +88,13 @@ ohos_unittest("context_deal_interface_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -107,8 +107,7 @@ ohos_unittest("context_deal_interface_test") { ] if (ability_runtime_graphics) { - deps += - [ "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client" ] + deps += [ "${multimodalinput_path}/frameworks/proxy:libmmi-client" ] } } @@ -127,17 +126,17 @@ ohos_unittest("application_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:app_context", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -157,11 +156,11 @@ ohos_unittest("application_test") { ohos_unittest("context_container_test") { module_out_path = module_output_path sources = [ + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "../app/src/ohos_application.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "unittest/context_container_test.cpp", ] @@ -169,13 +168,13 @@ ohos_unittest("context_container_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -196,13 +195,13 @@ ohos_unittest("application_context_for_task_dispacher_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -222,13 +221,13 @@ ohos_unittest("context_deal_for_task_dispacher_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -243,11 +242,11 @@ ohos_unittest("context_deal_for_task_dispacher_test") { ohos_unittest("context_deal_test") { module_out_path = module_output_path sources = [ + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", "${aafwk_path}/frameworks/kits/appkit/native/app/src/app_loader.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "../app/src/ohos_application.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "mock/include/mock_ability_manager_client.cpp", "unittest/context_deal_test.cpp", ] @@ -256,13 +255,13 @@ ohos_unittest("context_deal_test") { deps = [ "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -291,16 +290,16 @@ ohos_unittest("application_impl_test") { deps = [ "${ABILITY_INNERKITS_PATH}/uri_permission:uri_permission_mgr", "${ABILITY_INNERKITS_PATH}/want:want", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -321,7 +320,7 @@ config("ability_start_setting_config") { "${aafwk_path}/frameworks/kits/appkit/native/app/include", "//foundation/appexecfwk/common/log/include/", "//utils/native/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", ] } @@ -334,7 +333,7 @@ ohos_unittest("ability_start_setting_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_start_setting.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_start_setting.cpp", "unittest/ability_start_setting_test.cpp", ] @@ -355,7 +354,7 @@ ohos_unittest("watchdog_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//third_party/json/include", ] diff --git a/frameworks/kits/appkit/test/BUILD.gn b/frameworks/kits/appkit/test/BUILD.gn index 831a5a6b4d3..a989142c0d2 100644 --- a/frameworks/kits/appkit/test/BUILD.gn +++ b/frameworks/kits/appkit/test/BUILD.gn @@ -12,24 +12,25 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "ability_runtime/moduletest/application_test/" -#APP_INNERKITS_PATH = "//foundation/appexecfwk/standard/interfaces/innerkits" -ABILITY_INNERKITS_PATH = "//foundation/aafwk/standard/interfaces/innerkits" +#APP_INNERKITS_PATH = "${appexecfwk_path}/interfaces/innerkits" +ABILITY_INNERKITS_PATH = "${aafwk_path}/interfaces/innerkits" ############################################################################### config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content", + "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include", - #"//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/test/Mock/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + #"${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/appkit/test/Mock/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", #"//foundation/communication/utils/include", #"//foundation/communication/ipc/ipc/native/src/core/include", @@ -45,7 +46,7 @@ config("module_private_config") { ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", "Mock/include/mock_app_thread.cpp", "Mock/include/mock_application.cpp", @@ -61,15 +62,15 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { } deps = [ "${ABILITY_INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:configuration", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -87,7 +88,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", "Mock/include/mock_app_thread.cpp", "Mock/include/mock_application.cpp", @@ -103,15 +104,15 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { } deps = [ "${ABILITY_INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:configuration", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -129,7 +130,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", "Mock/include/mock_app_thread.cpp", "Mock/include/mock_application.cpp", @@ -145,15 +146,15 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { } deps = [ "${ABILITY_INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:configuration", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -171,7 +172,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp", "Mock/include/mock_app_thread.cpp", "Mock/include/mock_application.cpp", @@ -187,15 +188,15 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { } deps = [ "${ABILITY_INNERKITS_PATH}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:configuration", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/frameworks/kits/base/cpp/test/BUILD.gn b/frameworks/kits/base/cpp/test/BUILD.gn index 3d667f4b7b5..e106cec3f5a 100644 --- a/frameworks/kits/base/cpp/test/BUILD.gn +++ b/frameworks/kits/base/cpp/test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "aafwk/base_test" @@ -20,8 +21,7 @@ config("module_private_config") { include_dirs = [ "//utils/native/base/include" ] } -baseImpl = - "//foundation/aafwk/standard/frameworks/kits/base/cpp/src/ohos/aafwk/base" +baseImpl = "${aafwk_path}/frameworks/kits/base/cpp/src/ohos/aafwk/base" ohos_unittest("base_test") { module_out_path = module_output_path @@ -42,7 +42,7 @@ ohos_unittest("base_test") { configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/base:base_public_config", + "${aafwk_path}/interfaces/innerkits/base:base_public_config", ] deps = [ diff --git a/frameworks/kits/content/cpp/test/BUILD.gn b/frameworks/kits/content/cpp/test/BUILD.gn index e8aaa363e7f..b3fc9eeb716 100644 --- a/frameworks/kits/content/cpp/test/BUILD.gn +++ b/frameworks/kits/content/cpp/test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "ability_runtime/want_test" @@ -21,9 +22,9 @@ config("module_private_config") { include_dirs = [ "//utils/native/base/include", "//sdk/appexecfwk/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/appexecfwk/standard/common/log/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${appexecfwk_path}/common/log/include", ] defines = [ @@ -37,8 +38,8 @@ config("module_private_want_param_wrapper_config") { include_dirs = [ "//utils/native/base/include", "//sdk/appexecfwk/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/frameworks/kits/content/cpp/src", + "${aafwk_path}/interfaces/innerkits/want/include", + "${aafwk_path}/frameworks/kits/content/cpp/src", ] defines = [ @@ -50,19 +51,19 @@ config("module_private_want_param_wrapper_config") { ohos_unittest("operation_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/operation_builder.h", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content/operation_builder.h", "unittest/common/operation_test.cpp", ] configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -79,12 +80,12 @@ ohos_unittest("patterns_matcher_test") { configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -104,14 +105,14 @@ ohos_unittest("skills_test") { configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -132,13 +133,13 @@ ohos_unittest("want_params_test") { configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -160,10 +161,10 @@ ohos_unittest("want_params_wrapper_test") { configs = [ ":module_private_want_param_wrapper_config" ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -180,14 +181,14 @@ ohos_unittest("want_test") { configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index 519177153e6..e9ca1701d06 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/aafwk_L2" @@ -27,71 +28,71 @@ config("module_private_config") { "//third_party/json/include", "//utils/native/base/include", "//sdk/appexecfwk_L2/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/common/include", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS", - "//foundation/aafwk/standard/services/common/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/services/common/include", + "${aafwk_path}/frameworks/kits/test/mock/AMS", + "${aafwk_path}/services/common/include", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility", + "${aafwk_path}/services/abilitymgr/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", ] } ohos_moduletest("ability_moduletest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/caller_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/image_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_listener_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_listener_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_snapshot.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/remote_mission_listener_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/remote_mission_listener_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/wants_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record_info.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/caller_info.cpp", + "${aafwk_path}/services/abilitymgr/src/image_info.cpp", + "${aafwk_path}/services/abilitymgr/src/launch_param.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_state_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_listener_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_listener_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_snapshot.cpp", + "${aafwk_path}/services/abilitymgr/src/remote_mission_listener_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/remote_mission_listener_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/wants_info.cpp", "moduletest/cpp/abilitytest/ability_test.cpp", ] configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", - "//foundation/aafwk/standard/frameworks/kits/ability/native:ability_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/frameworks/kits/ability/native:ability_config", ] deps = [ - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -109,7 +110,9 @@ ohos_moduletest("ability_moduletest") { ] if (ability_runtime_graphics) { - deps += [ "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" ] + deps += [ + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", + ] external_deps += [ "input:libmmi-client" ] } } @@ -117,42 +120,42 @@ ohos_moduletest("ability_moduletest") { ohos_moduletest("ability_conetxt_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/caller_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record_info.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/caller_info.cpp", + "${aafwk_path}/services/abilitymgr/src/launch_param.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_state_info.cpp", "moduletest/cpp/abilitytest/ability_context_test.cpp", ] configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", - "//foundation/aafwk/standard/frameworks/kits/ability/native:ability_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/frameworks/kits/ability/native:ability_config", ] deps = [ - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -177,23 +180,23 @@ ohos_moduletest("ability_conetxt_test") { ohos_moduletest("ability_thread_call_request_module_test") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/context_container.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/moduletest/cpp/abilitytest/ability_thread_call_request_module_test.cpp", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", + "${aafwk_path}/frameworks/kits/appkit/native/app/src/context_container.cpp", + "${aafwk_path}/frameworks/kits/test/moduletest/cpp/abilitytest/ability_thread_call_request_module_test.cpp", + "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", ] configs = [ ":module_private_config" ] deps = [ - "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/common/task_dispatcher:task_dispatcher", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", ] @@ -204,52 +207,52 @@ ohos_moduletest("ability_thread_call_request_module_test") { ohos_moduletest("data_ability_operation_moduletest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/data_ability_operation.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/data_ability_operation_builder.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/caller_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_listener_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_listener_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_snapshot.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/remote_mission_listener_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/remote_mission_listener_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/wants_info.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/data_ability_operation.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/data_ability_operation_builder.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include/sys_mgr_client_mock.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_ability_manager_client.cpp", + "${aafwk_path}/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/demo_ability_test.cpp", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility/mock_lifecycle_observer.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record_info.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/caller_info.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_state_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_listener_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_listener_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_snapshot.cpp", + "${aafwk_path}/services/abilitymgr/src/remote_mission_listener_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/remote_mission_listener_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/wants_info.cpp", "moduletest/cpp/abilitytest/data_ability_operation_module_test.cpp", ] configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", - "//foundation/aafwk/standard/frameworks/kits/ability/native:ability_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/frameworks/kits/ability/native:ability_config", ] deps = [ - "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${global_path}/resmgr_standard/frameworks/resmgr:global_resmgr", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -268,7 +271,9 @@ ohos_moduletest("data_ability_operation_moduletest") { ] if (ability_runtime_graphics) { - deps += [ "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" ] + deps += [ + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", + ] external_deps += [ "input:libmmi-client" ] } } @@ -277,32 +282,32 @@ ohos_moduletest("data_ability_helper_module_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoAbility", - "//foundation/aafwk/standard/frameworks/kits/test/mock/DemoObServer", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", - "//foundation/aafwk/standard/services/dataobsmgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/test/mock/DemoAbility", + "${aafwk_path}/frameworks/kits/test/mock/DemoObServer", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/services/dataobsmgr/include", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//foundation/distributedschedule/samgr/services/samgr/native/include", "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", ] - sources = [ "//foundation/aafwk/standard/frameworks/kits/test/moduletest/cpp/abilitytest/data_ability_helper_module_test.cpp" ] + sources = [ "${aafwk_path}/frameworks/kits/test/moduletest/cpp/abilitytest/data_ability_helper_module_test.cpp" ] configs = [ ":module_private_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", - "//foundation/aafwk/standard/frameworks/kits/ability/native:ability_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/frameworks/kits/ability/native:ability_config", ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/frameworks/kits/wantagent/BUILD.gn b/frameworks/kits/wantagent/BUILD.gn index 3d4b6c50adf..6a7c3b0ff49 100644 --- a/frameworks/kits/wantagent/BUILD.gn +++ b/frameworks/kits/wantagent/BUILD.gn @@ -22,7 +22,7 @@ config("wantagent_innerkits_public_config") { visibility = [ ":*" ] include_dirs = [ - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", "${kits_path}/ability/native/include", "${innerkits_path}/ability_manager/include", "${innerkits_path}/wantagent/include", diff --git a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn index b6e09b3989a..110a96851ef 100644 --- a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("completed_dispatcher_test") { module_out_path = module_output_path - include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] + include_dirs = [ "${aafwk_path}/services/abilitymgr/include" ] sources = [ "completed_dispatcher_test.cpp" ] @@ -30,9 +30,9 @@ ohos_unittest("completed_dispatcher_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn index bfbcd9653a2..dbf140a6dcc 100644 --- a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -22,8 +22,8 @@ ohos_unittest("pending_want_test") { module_out_path = module_output_path include_dirs = [ "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", + "${aafwk_path}/services/abilitymgr/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//utils/native/base/include", ] @@ -36,10 +36,10 @@ ohos_unittest("pending_want_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn index 6c89a45c19a..2220a960c1b 100644 --- a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("trigger_Info_test") { module_out_path = module_output_path - include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] + include_dirs = [ "${aafwk_path}/services/abilitymgr/include" ] sources = [ "trigger_Info_test.cpp" ] @@ -30,9 +30,9 @@ ohos_unittest("trigger_Info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index ff2c39ffde9..07e2a4e043c 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -22,8 +22,8 @@ ohos_unittest("want_agent_helper_test") { module_out_path = module_output_path include_dirs = [ "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", + "${aafwk_path}/services/abilitymgr/include", ] sources = [ "want_agent_helper_test.cpp" ] @@ -34,10 +34,10 @@ ohos_unittest("want_agent_helper_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn index a8cad99499a..91209f9aaf9 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("want_agent_info_test") { module_out_path = module_output_path - include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] + include_dirs = [ "${aafwk_path}/services/abilitymgr/include" ] sources = [ "want_agent_info_test.cpp" ] @@ -30,9 +30,9 @@ ohos_unittest("want_agent_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn index d8dc900752f..9064efcfb9f 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("want_agent_test") { module_out_path = module_output_path - include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] + include_dirs = [ "${aafwk_path}/services/abilitymgr/include" ] sources = [ "want_agent_test.cpp" ] @@ -30,9 +30,9 @@ ohos_unittest("want_agent_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/idl/test/native/BUILD.gn b/idl/test/native/BUILD.gn index 8d0ae035d4d..38fd0b8cb50 100644 --- a/idl/test/native/BUILD.gn +++ b/idl/test/native/BUILD.gn @@ -12,9 +12,10 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/aafwk.gni") IPC_SUBSYSTEM_DIR = "//foundation/communication/ipc" -IDL_TEST_DIR = "//foundation/aafwk/standard/idl/test/native" +IDL_TEST_DIR = "${aafwk_path}/idl/test/native" config("ipc_test_config") { include_dirs = [ diff --git a/interfaces/innerkits/ability_manager/BUILD.gn b/interfaces/innerkits/ability_manager/BUILD.gn index 5253fc00ef0..6c5332a33fc 100644 --- a/interfaces/innerkits/ability_manager/BUILD.gn +++ b/interfaces/innerkits/ability_manager/BUILD.gn @@ -37,9 +37,8 @@ config("ability_manager_public_config") { ] if (ability_runtime_graphics) { - include_dirs += [ - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - ] + include_dirs += + [ "${multimedia_path}/image_standard/interfaces/innerkits/include" ] defines = [ "SUPPORT_GRAPHICS" ] } diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index b53f469602a..3f12f63bbbb 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -13,57 +13,58 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/feature.gni") +import("//foundation/aafwk/standard/aafwk.gni") group("napi_packages") { deps = [ - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability:ability_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/abilityManager:abilitymanager", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability_constant:abilityconstant_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability_context:abilitycontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability_manager:abilitymanager_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_delegator:abilitydelegatorregistry", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_stage:abilitystage_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_stage_context:abilitystagecontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/appMgr:napi_app_mgr", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/app_manager:appmanager_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/context:context_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/test_runner:testrunner_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/callee:callee_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/caller:caller_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/configuration_constant:configurationconstant_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/dataShare:datashare", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/dataUriUtils:datauriutils", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/datashare_ext_ability:datashareextensionability_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/datashare_ext_ability_context:datashareextensionabilitycontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/extensioncontext:extensioncontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility:featureability", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/feature_ability:featureability_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/mission_manager:distributedmissionmanager", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/mission_manager:missionmanager_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/particleAbility:particleability", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/service_extension_ability:serviceextensionability_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/service_extension_context:serviceextensioncontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/serviceextension:serviceextension_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/static_subscriber_extension:staticsubscriberextensionability_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/static_subscriber_extension_context:staticsubscriberextensioncontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/uri_permission:uripermissionmanager_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/wantConstant:wantconstant", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/wantagent:wantagent", + "${aafwk_path}/interfaces/kits/napi/aafwk/ability:ability_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/abilityManager:abilitymanager", + "${aafwk_path}/interfaces/kits/napi/aafwk/ability_constant:abilityconstant_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/ability_context:abilitycontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/ability_manager:abilitymanager_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/ability_delegator:abilitydelegatorregistry", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/ability_stage:abilitystage_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/ability_stage_context:abilitystagecontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/appMgr:napi_app_mgr", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/app_manager:appmanager_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/context:context_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/app/test_runner:testrunner_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/callee:callee_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/caller:caller_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/configuration_constant:configurationconstant_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/dataShare:datashare", + "${aafwk_path}/interfaces/kits/napi/aafwk/dataUriUtils:datauriutils", + "${aafwk_path}/interfaces/kits/napi/aafwk/datashare_ext_ability:datashareextensionability_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/datashare_ext_ability_context:datashareextensionabilitycontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/extensioncontext:extensioncontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/featureAbility:featureability", + "${aafwk_path}/interfaces/kits/napi/aafwk/feature_ability:featureability_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", + "${aafwk_path}/interfaces/kits/napi/aafwk/mission_manager:distributedmissionmanager", + "${aafwk_path}/interfaces/kits/napi/aafwk/mission_manager:missionmanager_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/particleAbility:particleability", + "${aafwk_path}/interfaces/kits/napi/aafwk/service_extension_ability:serviceextensionability_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/service_extension_context:serviceextensioncontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/serviceextension:serviceextension_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/static_subscriber_extension:staticsubscriberextensionability_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/static_subscriber_extension_context:staticsubscriberextensioncontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/uri_permission:uripermissionmanager_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/wantConstant:wantconstant", + "${aafwk_path}/interfaces/kits/napi/aafwk/wantagent:wantagent", ] } group("form_napi_packages") { if (ability_runtime_graphics) { deps = [ - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formHost:formhost_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formManager:formmanager", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formProvider:formprovider_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formUtil:formutil_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_binding_data:formbindingdata_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension:formextension_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension_context:formextensioncontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_info:forminfo_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/formHost:formhost_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/formManager:formmanager", + "${aafwk_path}/interfaces/kits/napi/aafwk/formProvider:formprovider_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/formUtil:formutil_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/form_binding_data:formbindingdata_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/form_extension:formextension_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/form_extension_context:formextensioncontext_napi", + "${aafwk_path}/interfaces/kits/napi/aafwk/form_info:forminfo_napi", ] } } diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 50ca70b94e2..05c03014b4a 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -63,10 +63,10 @@ config("abilityms_config") { if (ability_runtime_graphics) { include_dirs += [ - "//foundation/graphic/standard/interfaces/innerkits", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/graphic/standard/interfaces/innerkits/wmservice", - "//base/global/i18n/frameworks/intl/include", + "${graphic_path}/standard/interfaces/innerkits", + "${multimedia_path}/image_standard/interfaces/innerkits/include", + "${graphic_path}/standard/interfaces/innerkits/wmservice", + "${global_path}/i18n/frameworks/intl/include", ] defines = [ "SUPPORT_GRAPHICS" ] @@ -131,7 +131,7 @@ ohos_shared_library("abilityms") { "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//third_party/libpng:libpng", ] - public_deps = [ "//foundation/graphic/standard:libwmservice" ] + public_deps = [ "${graphic_path}/standard:libwmservice" ] external_deps += [ "i18n:intl_util", "multimedia_image_standard:image_native", diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index ea8701cde9f..9a4aa9329e3 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -61,15 +61,15 @@ ohos_source_set("abilityms_test_source") { ] include_dirs = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/", "${EVENT_DIR}/frameworks/core/include", "${EVENT_DIR}/interfaces/innerkits/native/include", "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/account/os_account/frameworks/common/account_error/include", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/log/include", @@ -78,10 +78,10 @@ ohos_source_set("abilityms_test_source") { ] external_dependent_files = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_state_callback_host.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp", - "//foundation/appexecfwk/standard/common/log/src/app_log_wrapper.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_state_callback_host.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp", + "${appexecfwk_path}/common/log/src/app_log_wrapper.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp", ] sources += external_dependent_files @@ -101,8 +101,8 @@ ohos_source_set("abilityms_test_source") { "${innerkits_path}/want:want", "${services_path}/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", ] @@ -131,10 +131,10 @@ ohos_source_set("abilityms_test_source") { "${services_path}/abilitymgr/src/screenshot_response.cpp", ] deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/graphic/standard:libwmservice", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${graphic_path}/standard:libwmservice", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", ] } diff --git a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn index c4406603158..48eea95afa3 100644 --- a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn +++ b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn @@ -17,13 +17,13 @@ import("//foundation/aafwk/standard/feature.gni") config("appmgr_test_service_config") { include_dirs = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/appmgr_test_service/include/", - "//foundation/aafwk/standard/services/abilitymgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/services/common/include", + "${aafwk_path}/services/abilitymgr/test/mock/appmgr_test_service/include/", + "${aafwk_path}/services/abilitymgr/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/services/common/include", "//base/notification/ces_standard/frameworks/core/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", ] @@ -33,7 +33,7 @@ ohos_source_set("appmgr_test_service") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/aakit/include", + "${aafwk_path}/services/abilitymgr/test/mock/libs/aakit/include", "//third_party/jsoncpp/include", ] @@ -46,15 +46,15 @@ ohos_source_set("appmgr_test_service") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] if (ability_runtime_graphics) { - public_deps = [ "//foundation/graphic/standard:libwmservice" ] + public_deps = [ "${graphic_path}/standard:libwmservice" ] defines = [ "SUPPORT_GRAPHICS" ] } diff --git a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn index 84bb315b4b8..84ef965d84b 100644 --- a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn @@ -17,17 +17,17 @@ import("//foundation/aafwk/standard/feature.gni") config("aakit_mock_config") { include_dirs = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/aakit/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/services/abilitymgr/test/mock/libs/aakit/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/services/abilitymgr/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", "include/", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/services/common/include/", + "${aafwk_path}/services/common/include/", ] } @@ -44,9 +44,9 @@ ohos_source_set("aakit_mock") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/jsoncpp:jsoncpp", diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn index 870419171a4..18205e3a13e 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn @@ -16,21 +16,21 @@ import("//foundation/aafwk/standard/aafwk.gni") config("appexecfwk_core_mock_config") { include_dirs = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/include/", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/include/appmgr", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/include/", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/include/appmgr", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/services/abilitymgr/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/include/", "//base/telephony/core_service/sim/include/", "//base/notification/ces_standard/frameworks/core/include/", "//base/notification/ces_standard/interfaces/innerkits/native/include/", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/aakit/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/services/abilitymgr/test/mock/libs/aakit/include/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", ] } @@ -44,9 +44,9 @@ ohos_source_set("appexecfwk_appmgr_mock") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", @@ -72,8 +72,8 @@ ohos_source_set("appexecfwk_bundlemgr_mock") { } deps = [ "${innerkits_path}/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn b/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn index 2c074f41bf4..59a2a9d359c 100644 --- a/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/sa_mgr/BUILD.gn @@ -17,7 +17,7 @@ import("//foundation/aafwk/standard/aafwk.gni") config("sa_mgr_mock_config") { include_dirs = [ "${services_path}/abilitymgr/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", ] cflags = [] if (target_cpu == "arm") { @@ -33,7 +33,7 @@ ohos_source_set("sa_mgr_mock") { ] deps = [ - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn index 1351003c124..0e2c7643071 100644 --- a/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("ability_connect_callback_proxy_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_connect_callback_proxy_test.cpp", # add mock file ] @@ -45,11 +45,11 @@ ohos_unittest("ability_connect_callback_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn index 08fd61665b1..2a6ac8807c4 100644 --- a/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("ability_connect_callback_stub_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_connect_callback_stub_test.cpp", # add mock file ] @@ -45,12 +45,12 @@ ohos_unittest("ability_connect_callback_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/services/abilitymgr:abilityms", - # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn index 84dc4f56432..3e4b178b487 100644 --- a/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn @@ -21,10 +21,10 @@ ohos_unittest("ability_connect_manage_test") { sources = [ # add mock file - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/dummy_data_ability_predicates.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/dummy_result_set.cpp", - "//foundation/aafwk/standard/frameworks/kits/ability/native/src/dummy_values_bucket.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/dummy_data_ability_predicates.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/dummy_result_set.cpp", + "${aafwk_path}/frameworks/kits/ability/native/src/dummy_values_bucket.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_connect_manage_test.cpp", ] @@ -43,11 +43,11 @@ ohos_unittest("ability_connect_manage_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_client_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_client_test/BUILD.gn index 31b18e0b205..d28885c93f5 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_client_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_client_test/BUILD.gn @@ -21,8 +21,8 @@ ohos_unittest("ability_manager_client_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ @@ -42,13 +42,13 @@ ohos_unittest("ability_manager_client_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn index aee8bae1ee1..553e1954b97 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn @@ -22,14 +22,14 @@ ohos_unittest("ability_manager_proxy_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${appexecfwk_path}/common/log/include", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_manager_proxy_test.cpp", ] @@ -47,13 +47,13 @@ ohos_unittest("ability_manager_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", - # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_service_account_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_service_account_test/BUILD.gn index fecb405b94e..09b12dd1796 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_service_account_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_account_test/BUILD.gn @@ -23,14 +23,14 @@ ohos_unittest("ability_manager_service_account_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_manager_service_account_test.cpp", ] @@ -47,12 +47,12 @@ ohos_unittest("ability_manager_service_account_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn index b9a61e4dd96..2fdaffecc96 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn @@ -23,12 +23,12 @@ ohos_unittest("ability_manager_stub_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/utils/native/include/", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_manager_stub_test.cpp", ] @@ -46,12 +46,12 @@ ohos_unittest("ability_manager_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn index 61edec157e0..e59fbaa20d9 100644 --- a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("ability_record_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_record_test.cpp", # add mock file ] @@ -45,12 +45,12 @@ ohos_unittest("ability_record_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", @@ -73,12 +73,12 @@ ohos_unittest("ability_record_test_call") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_record_test_call.cpp", # add mock file ] @@ -97,12 +97,12 @@ ohos_unittest("ability_record_test_call") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn index 830657f22d7..4bd5a75e8f4 100644 --- a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn @@ -22,11 +22,11 @@ ohos_unittest("ability_scheduler_proxy_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_scheduler_proxy_test.cpp", ] @@ -45,13 +45,13 @@ ohos_unittest("ability_scheduler_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", - # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn index aa3a7726b9f..0c078999d7e 100644 --- a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("ability_scheduler_stub_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_scheduler_stub_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("ability_scheduler_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", diff --git a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn index b0b9e4a73bf..613c6c31fc1 100644 --- a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("ability_service_start_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_service_start_test.cpp", # add mock file ] @@ -45,12 +45,12 @@ ohos_unittest("ability_service_start_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_timeout_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_timeout_test/BUILD.gn index ec445839649..56139637df9 100644 --- a/services/abilitymgr/test/unittest/phone/ability_timeout_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_timeout_test/BUILD.gn @@ -23,13 +23,13 @@ ohos_unittest("ability_timeout_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_timeout_test.cpp", ] @@ -45,13 +45,13 @@ ohos_unittest("ability_timeout_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn index 51efe8a531a..6337acfd2ed 100644 --- a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("ability_token_proxy_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_token_proxy_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("ability_token_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", diff --git a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn index c0b20cdd1b6..0ff3fea7d6e 100644 --- a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("ability_token_stub_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_token_stub_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("ability_token_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", diff --git a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn index c3f37a94f8f..345e061044a 100644 --- a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn @@ -28,7 +28,7 @@ ohos_unittest("app_scheduler_test") { #sources = abilityms_files sources = [ - "//foundation/aafwk/standard/services/abilitymgr/src/app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/src/app_scheduler.cpp", "app_scheduler_test.cpp", ] sources += free_install @@ -48,11 +48,11 @@ ohos_unittest("app_scheduler_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/call_container_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/call_container_test/BUILD.gn index 25904785b40..dd030e7fd3e 100644 --- a/services/abilitymgr/test/unittest/phone/call_container_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/call_container_test/BUILD.gn @@ -21,13 +21,13 @@ ohos_unittest("call_container_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "call_container_test.cpp", ] @@ -42,10 +42,10 @@ ohos_unittest("call_container_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn index 4527747a092..f051d011ba2 100644 --- a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn @@ -22,12 +22,12 @@ ohos_unittest("configuration_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/include", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "configuration_test.cpp", # add mock file ] @@ -46,13 +46,13 @@ ohos_unittest("configuration_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn index 90edb021d1a..7d5e7882388 100644 --- a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("connection_record_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "connection_record_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("connection_record_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", 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 3bf6449c2e3..05ed6f3d41b 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 @@ -25,20 +25,20 @@ ohos_unittest("data_ability_manager_test") { "${services_path}/abilitymgr/test/mock/libs/ability_scheduler_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/services/common/include", + # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/services/common/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/src/app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/src/app_scheduler.cpp", "data_ability_manager_test.cpp", # add mock file ] configs = [ "${services_path}/abilitymgr:abilityms_config", - "//foundation/aafwk/standard/interfaces/innerkits/base:base_public_config", + "${aafwk_path}/interfaces/innerkits/base:base_public_config", "${services_path}/abilitymgr/test/mock:aafwk_mock_config", ] cflags = [] @@ -53,12 +53,12 @@ ohos_unittest("data_ability_manager_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", - #"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", 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 8c482d08c29..3ba76c61c97 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 @@ -23,20 +23,20 @@ ohos_unittest("data_ability_record_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "${services_path}/abilitymgr/test/mock/libs/ability_scheduler_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/services/common/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/services/common/include", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "data_ability_record_test.cpp", # add mock file ] configs = [ "${services_path}/abilitymgr:abilityms_config", - "//foundation/aafwk/standard/interfaces/innerkits/base:base_public_config", + "${aafwk_path}/interfaces/innerkits/base:base_public_config", "${services_path}/abilitymgr/test/mock:aafwk_mock_config", ] cflags = [] @@ -50,13 +50,13 @@ ohos_unittest("data_ability_record_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", - #"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn index c1c1ea4f778..a1aa07bada5 100644 --- a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn @@ -22,11 +22,11 @@ ohos_unittest("lifecycle_deal_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "lifecycle_deal_test.cpp", # add mock file ] @@ -45,12 +45,12 @@ ohos_unittest("lifecycle_deal_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn index ec80f8caf8f..59b0ede672c 100644 --- a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("lifecycle_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "lifecycle_test.cpp", # add mock file ] @@ -45,12 +45,12 @@ ohos_unittest("lifecycle_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/mission_list_dump_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_dump_test/BUILD.gn index 5688edb4c10..0c99df9cd42 100644 --- a/services/abilitymgr/test/unittest/phone/mission_list_dump_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_list_dump_test/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("mission_list_dump_test") { configs = [ "${aafwk_path}/services/abilitymgr:abilityms_config" ] - deps = [ "//foundation/aafwk/standard/services/abilitymgr:abilityms" ] + deps = [ "${aafwk_path}/services/abilitymgr:abilityms" ] external_deps = [ "ability_base:want", diff --git a/services/abilitymgr/test/unittest/phone/mission_list_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_manager_test/BUILD.gn index 8cddd53d0fe..6ba065d703f 100644 --- a/services/abilitymgr/test/unittest/phone/mission_list_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_list_manager_test/BUILD.gn @@ -25,8 +25,8 @@ ohos_unittest("mission_list_manager_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", "mission_list_manager_test.cpp", # add mock file ] @@ -45,11 +45,11 @@ ohos_unittest("mission_list_manager_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", diff --git a/services/abilitymgr/test/unittest/phone/mission_list_manager_ut_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_manager_ut_test/BUILD.gn index d3bd48bc6af..154f6aa3066 100644 --- a/services/abilitymgr/test/unittest/phone/mission_list_manager_ut_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_list_manager_ut_test/BUILD.gn @@ -43,12 +43,12 @@ ohos_unittest("mission_list_manager_ut_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn index 42af18f0b35..0c009fb76b9 100644 --- a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("mission_list_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "mission_list_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("mission_list_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", @@ -78,12 +78,12 @@ ohos_unittest("mission_list_test_call") { "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", ] diff --git a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn index cee585653ee..68d073d3ee9 100644 --- a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("mission_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "mission_test.cpp", # add mock file ] @@ -44,12 +44,12 @@ ohos_unittest("mission_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", 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 9b318c74d12..62993cb3e11 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 @@ -20,12 +20,12 @@ ohos_unittest("pending_want_key_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/services/abilitymgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/services/abilitymgr/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "pending_want_key_test.cpp", # add mock file ] @@ -38,12 +38,12 @@ ohos_unittest("pending_want_key_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn index d4ded8f871b..04aa933e047 100644 --- a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("pending_want_manager_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "pending_want_manager_test.cpp", # add mock file ] @@ -42,12 +42,12 @@ ohos_unittest("pending_want_manager_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn index 68e147d4ba3..dc6d8e7f1ea 100644 --- a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("pending_want_record_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "pending_want_record_test.cpp", # add mock file ] @@ -42,12 +42,12 @@ ohos_unittest("pending_want_record_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/running_infos_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/running_infos_test/BUILD.gn index 845cab6449a..2e0926f60a3 100644 --- a/services/abilitymgr/test/unittest/phone/running_infos_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/running_infos_test/BUILD.gn @@ -23,13 +23,13 @@ ohos_unittest("running_infos_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "running_infos_test.cpp", ] @@ -46,12 +46,12 @@ ohos_unittest("running_infos_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn index ad9baf2dc04..ba106baa796 100644 --- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn @@ -22,12 +22,12 @@ ohos_unittest("ability_screenshot_handler_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "screenshot_handler_test.cpp", ] @@ -47,14 +47,14 @@ ohos_unittest("ability_screenshot_handler_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn index c9ef4959924..0a67e37cdf7 100644 --- a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("sender_info_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "sender_info_test.cpp", # add mock file ] @@ -42,12 +42,12 @@ ohos_unittest("sender_info_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/specified_mission_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/specified_mission_list_test/BUILD.gn index 99f57765caf..024f7c09177 100644 --- a/services/abilitymgr/test/unittest/phone/specified_mission_list_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/specified_mission_list_test/BUILD.gn @@ -25,8 +25,8 @@ ohos_unittest("specified_mission_list_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", "specified_mission_list_test.cpp", # add mock file ] @@ -45,11 +45,11 @@ ohos_unittest("specified_mission_list_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", "//utils/native/base:utils", diff --git a/services/abilitymgr/test/unittest/phone/start_option_display_id_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/start_option_display_id_test/BUILD.gn index a656cdf62aa..1b72ec1c662 100644 --- a/services/abilitymgr/test/unittest/phone/start_option_display_id_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/start_option_display_id_test/BUILD.gn @@ -23,14 +23,14 @@ ohos_unittest("start_option_display_id_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp", "start_option_display_id_test.cpp", ] @@ -47,12 +47,12 @@ ohos_unittest("start_option_display_id_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn index 7bf5a159320..ad7bd2d7d47 100644 --- a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("want_receiver_proxy_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "want_receiver_proxy_test.cpp", ] @@ -43,12 +43,12 @@ ohos_unittest("want_receiver_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn index 64e2a517de3..ac0c96a5205 100644 --- a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("want_receiver_stub_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "want_receiver_stub_test.cpp", ] @@ -44,12 +44,12 @@ ohos_unittest("want_receiver_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn index f04aafc6ef2..eac94153b61 100644 --- a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("want_sender_info_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "want_sender_info_test.cpp", ] @@ -42,12 +42,12 @@ ohos_unittest("want_sender_info_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn index 737d7f835af..79eaaf590a3 100644 --- a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("want_sender_proxy_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "want_sender_proxy_test.cpp", ] @@ -43,12 +43,12 @@ ohos_unittest("want_sender_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn index 594e2886c7a..809ed0232e9 100644 --- a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("want_sender_stub_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "want_sender_stub_test.cpp", ] @@ -44,12 +44,12 @@ ohos_unittest("want_sender_stub_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn index d8128308a25..64b6781f6e6 100644 --- a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("wants_info_test") { ] sources = [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "wants_info_test.cpp", ] @@ -43,12 +43,12 @@ ohos_unittest("wants_info_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/appmgr/examples/BUILD.gn b/services/appmgr/examples/BUILD.gn index 609f9d5b5f7..62a437ad276 100644 --- a/services/appmgr/examples/BUILD.gn +++ b/services/appmgr/examples/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/aafwk.gni") ohos_executable("appspawnclienttest") { sources = [ "app_spawn_client_test/main.cpp" ] configs = [ ":test_config" ] - deps = [ "//foundation/aafwk/standard/services/appmgr:libams" ] + deps = [ "${aafwk_path}/services/appmgr:libams" ] external_deps = [ "ability_base:base", "ability_base:want", @@ -40,7 +41,7 @@ ohos_executable("appmgrserviceregtest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/services/appmgr:libams", #"startup:appspawn_jni", ] @@ -65,11 +66,11 @@ ohos_executable("appmgrserviceregtest") { config("test_config") { # header file path include_dirs = [ - "//foundation/aafwk/standard/services/appmgr/include", - "//foundation/appexecfwk/standard/services/common/include", + "${aafwk_path}/services/appmgr/include", + "${appexecfwk_path}/services/common/include", ] # enable exception - configs = [ "//foundation/aafwk/standard/services/appmgr:appmgr_config" ] + configs = [ "${aafwk_path}/services/appmgr:appmgr_config" ] } diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 8c276bc33b6..9488f2e8d2a 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -34,7 +34,7 @@ config("appmgr_test_config") { "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "//base/notification/ces_standard/frameworks/core/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", - "//base/global/i18n/frameworks/intl/include", + "${global_path}/i18n/frameworks/intl/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", ] } @@ -90,15 +90,15 @@ ohos_source_set("appmgr_test_source") { } deps = [ "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] if (ability_runtime_graphics) { - deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } external_deps = [ 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 d0648755fa2..90828560642 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,14 +20,14 @@ ohos_unittest("AmsAbilityRunningRecordTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/inclide", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/base/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", + "${aafwk_path}/interfaces/innerkits/app_manager/inclide", + "${aafwk_path}/interfaces/innerkits/uri/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", ] @@ -58,8 +58,8 @@ ohos_unittest("AmsAbilityRunningRecordTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/services/appmgr:libams", ] if (os_account_part_enabled) { diff --git a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn index 299a21a2697..a72f659e60a 100644 --- a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -56,11 +56,11 @@ ohos_unittest("AppDeathRecipientTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", diff --git a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn index c8f417ef4e0..95b4ccca898 100644 --- a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn @@ -55,11 +55,11 @@ ohos_unittest("AmsAppLifeCycleTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] 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 65f92253460..9609373a215 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,10 +27,10 @@ ohos_unittest("AmsAppMgrClientTest") { sources += [ "ams_app_mgr_client_test.cpp" ] include_dirs = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/", - "//foundation/aafwk/standard/interfaces/innerkits/base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include/", + "${aafwk_path}/interfaces/innerkits/want/include/", + "${aafwk_path}/interfaces/innerkits/base/include/", + "${aafwk_path}/interfaces/innerkits/uri/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//base/account/os_account/frameworks/common/database/include", @@ -48,7 +48,7 @@ ohos_unittest("AmsAppMgrClientTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] 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 59922b31f53..a60edfcc235 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,13 +20,13 @@ ohos_unittest("AmsAppRunningRecordTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", + "${aafwk_path}/interfaces/innerkits/base/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", ] @@ -56,7 +56,7 @@ ohos_unittest("AmsAppRunningRecordTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/services/appmgr:libams", ] if (os_account_part_enabled) { diff --git a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn index d30cc342254..50fb447099e 100644 --- a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn @@ -53,10 +53,10 @@ ohos_unittest("AmsWorkFlowTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] 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 f363a0b6e89..f0a5c708e9a 100644 --- a/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn @@ -22,11 +22,11 @@ ohos_unittest("AmsIpcAppSchedulerInterfaceTest") { include_dirs = [ "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", ] configs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] sources = [ "ams_ipc_appscheduler_interface_test.cpp" ] @@ -52,8 +52,8 @@ ohos_unittest("AmsIpcAppMgrInterfaceTest") { } deps = [ "${services_path}/appmgr/test:appmgr_test_source", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", ] if (os_account_part_enabled) { 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 2de1537ec27..fc6a70b6ec6 100644 --- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn @@ -20,15 +20,15 @@ ohos_unittest("AmsMgrSchedulerTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/appmgr/include", + "${aafwk_path}/interfaces/innerkits/base/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${aafwk_path}/services/appmgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", ] sources = [ "${services_path}/appmgr/src/ams_mgr_scheduler.cpp" ] @@ -47,7 +47,7 @@ ohos_unittest("AmsMgrSchedulerTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/services/appmgr:libams", ] if (os_account_part_enabled) { diff --git a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn index e2c26bfd2b0..c39087fd4fd 100644 --- a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn @@ -53,11 +53,11 @@ ohos_unittest("AmsRecentAppListTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] 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 7aead3646df..9b76d1cda87 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 @@ -20,7 +20,7 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/services/appmgr/test/mock/include", + "${aafwk_path}/services/appmgr/test/mock/include", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", @@ -55,9 +55,9 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/appmgr:libams", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn index 0bf8dbdf133..aa3a7add91e 100644 --- a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn @@ -20,13 +20,13 @@ ohos_unittest("AmsServiceEventDriveTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/services/appmgr/test/mock/include", + "${aafwk_path}/services/appmgr/test/mock/include", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", "//utils/native/base/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/aafwk/standard/services/appmgr/src", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", + "${aafwk_path}/services/appmgr/src", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", ] @@ -57,9 +57,9 @@ ohos_unittest("AmsServiceEventDriveTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/appmgr:libams", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 475f9a4d391..95025bf5fbc 100644 --- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -57,10 +57,10 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] diff --git a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn index 26c805760c9..d59160b95a7 100644 --- a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_unittest("AmsServiceStartupTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/services/appmgr/test/mock/include", + "${aafwk_path}/services/appmgr/test/mock/include", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", @@ -52,10 +52,10 @@ ohos_unittest("AmsServiceStartupTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/appmgr:libams", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] diff --git a/services/appmgr/test/unittest/app_mgr_service_dump_test/BUILD.gn b/services/appmgr/test/unittest/app_mgr_service_dump_test/BUILD.gn index 82bfe2a310a..022070d3f6c 100644 --- a/services/appmgr/test/unittest/app_mgr_service_dump_test/BUILD.gn +++ b/services/appmgr/test/unittest/app_mgr_service_dump_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("app_mgr_service_dump_test") { configs = [ "${aafwk_path}/services/appmgr:appmgr_config" ] deps = [ - "//foundation/aafwk/standard/services/appmgr:libams", + "${aafwk_path}/services/appmgr:libams", "//third_party/googletest:gtest_main", ] diff --git a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index 5034c1ffce5..106e5bc131f 100644 --- a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -55,11 +55,11 @@ ohos_unittest("AMSEventHandlerTest") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", 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 421ae2a9292..78e170da0bf 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,12 +20,12 @@ ohos_unittest("AppRunningProcessesInfoTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", + "${aafwk_path}/interfaces/innerkits/base/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/frameworks/common/account_error/include", ] @@ -53,8 +53,8 @@ ohos_unittest("AppRunningProcessesInfoTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${aafwk_path}/services/appmgr:libams", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", ] if (os_account_part_enabled) { diff --git a/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn index 2f909879f9f..08190992d06 100644 --- a/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn @@ -30,11 +30,11 @@ ohos_unittest("data_ability_observer_proxy_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn index 557e8402855..4ba0902bcd5 100644 --- a/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn @@ -30,11 +30,11 @@ ohos_unittest("data_ability_observer_stub_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn index 69b5f3881e8..1c40108977b 100644 --- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn @@ -21,7 +21,7 @@ ohos_unittest("dataobs_mgr_client_test") { include_dirs = [ "//utils/native/base/include", - "//foundation/aafwk/standard/services/dataobsmgr/include", + "${aafwk_path}/services/dataobsmgr/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -34,11 +34,11 @@ ohos_unittest("dataobs_mgr_client_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn index 4be39055847..5664ca18632 100644 --- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn @@ -30,11 +30,11 @@ ohos_unittest("dataobs_mgr_inner_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn index c600e1383c8..10d7b65b945 100644 --- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn @@ -31,10 +31,10 @@ ohos_unittest("dataobs_mgr_proxy_test") { deps = [ "${innerkits_path}/uri:zuri", "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn index 04d851870ef..1d337dfd81f 100644 --- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn @@ -31,11 +31,11 @@ ohos_unittest("dataobs_mgr_service_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn index 7be3325f0c2..5620f6ba298 100644 --- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn +++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn @@ -30,11 +30,11 @@ ohos_unittest("dataobs_mgr_stub_test") { } deps = [ "${innerkits_path}/want:want", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/dataobsmgr:dataobsms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/dataobs_manager:dataobs_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/dataobsmgr:dataobsms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn index a21d60ed8e6..bc46f41df34 100644 --- a/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn @@ -19,26 +19,26 @@ module_output_path = "form_runtime/formmgrservice" ohos_unittest("FmsFormCacheMgrTest") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_cache_mgr_test/fms_form_cache_mgr_test.cpp" ] + sources = [ "${aafwk_path}/services/formmgr/test/unittest/fms_form_cache_mgr_test/fms_form_cache_mgr_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${aafwk_path}/interfaces/innerkits/form_manager/include", ] configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", ] cflags = [] if (target_cpu == "arm") { @@ -50,10 +50,10 @@ ohos_unittest("FmsFormCacheMgrTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", diff --git a/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn index 46cdf6ed868..2c87cc0565e 100644 --- a/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn @@ -20,29 +20,29 @@ ohos_unittest("FmsFormDataMgrTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_data_mgr_test/fms_form_data_mgr_test.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/unittest/fms_form_data_mgr_test/fms_form_data_mgr_test.cpp", ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", #"//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/services/formmgr/test/mock/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/services/formmgr/test/mock/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", ] configs = [ #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", - #"//foundation/appexecfwk/standard/services/formmgr:formmgr_config", + #"${appexecfwk_path}/services/formmgr:formmgr_config", ] cflags = [] if (target_cpu == "arm") { @@ -52,11 +52,11 @@ ohos_unittest("FmsFormDataMgrTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", #"${libs_path}/libeventhandler:libeventhandler_target", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", diff --git a/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn index 0fb84ce4175..26d55e8f321 100644 --- a/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn @@ -19,26 +19,26 @@ module_output_path = "form_runtime/formmgrservice" ohos_unittest("FmsFormDbRecordTest") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_db_record_test/fms_form_db_record_test.cpp" ] + sources = [ "${aafwk_path}/services/formmgr/test/unittest/fms_form_db_record_test/fms_form_db_record_test.cpp" ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", #"//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", ] configs = [ #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", - #"//foundation/appexecfwk/standard/services/formmgr:formmgr_config", + #"${appexecfwk_path}/services/formmgr:formmgr_config", ] cflags = [] if (target_cpu == "arm") { @@ -48,11 +48,11 @@ ohos_unittest("FmsFormDbRecordTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", #"${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", diff --git a/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn index cdf1bfd3f88..6da1a69285f 100644 --- a/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormHostRecordTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_host_record_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,7 +45,7 @@ ohos_unittest("FmsFormHostRecordTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", ] cflags = [] if (target_cpu == "arm") { @@ -57,10 +57,10 @@ ohos_unittest("FmsFormHostRecordTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn index 9a915090382..e1c89114b10 100644 --- a/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormInfoMgrTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_info_mgr_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,7 +45,7 @@ ohos_unittest("FmsFormInfoMgrTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", ] cflags = [] if (target_cpu == "arm") { @@ -57,10 +57,10 @@ ohos_unittest("FmsFormInfoMgrTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn index e52227d863e..c4724786a44 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn @@ -20,32 +20,32 @@ ohos_unittest("FmsFormMgrAddFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_add_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", ] configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", ] @@ -59,10 +59,10 @@ ohos_unittest("FmsFormMgrAddFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn index 1a3f71ce77a..7fb324898c6 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_cast_temp_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,8 +45,8 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -58,10 +58,10 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn index 0f9c7ffa311..3b370249abb 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn @@ -20,26 +20,26 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", - # "//foundation/appexecfwk/standard/services/formmgr/test/mock/src/mock_form_death_callback.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + # "${appexecfwk_path}/services/formmgr/test/mock/src/mock_form_death_callback.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_death_callback_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -47,7 +47,7 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", ] cflags = [] if (target_cpu == "arm") { @@ -59,12 +59,12 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", #"${appexecfwk_path}/services/bundlemgr:bms_target", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn index d1ae7578fbc..360d030c410 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_delete_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,8 +45,8 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", ] @@ -60,12 +60,12 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", #"${appexecfwk_path}/services/bundlemgr:bms_target", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn index 911468816cf..ac1b8e7a0bb 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn @@ -20,36 +20,36 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp", ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", "//base/notification/ces_standard/cesfwk/kits/native/include", - "//foundation/aafwk/standard/services/formmgr/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${aafwk_path}/services/formmgr/test/mock/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", ] configs = [ #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", - #"//foundation/appexecfwk/standard/services/formmgr:formmgr_config", + #"${appexecfwk_path}/services/formmgr:formmgr_config", ] cflags = [] if (target_cpu == "arm") { @@ -59,12 +59,12 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", #"${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", #"//base/startup/appspawn_standard:appspawn_socket_client", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn index 5fba3984be9..e9eff3902ac 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrMessageEventTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_message_event_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,7 +45,7 @@ ohos_unittest("FmsFormMgrMessageEventTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", ] cflags = [] if (target_cpu == "arm") { @@ -57,10 +57,10 @@ ohos_unittest("FmsFormMgrMessageEventTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn index 2ca58a5ca02..ff55e781378 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn @@ -20,36 +20,36 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/fms_form_mgr_notify_invisible_forms_test.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/fms_form_mgr_notify_invisible_forms_test.cpp", ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//base/notification/ces_standard/cesfwk/kits/native/include", - "//foundation/aafwk/standard/services/formmgr/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${aafwk_path}/services/formmgr/test/mock/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", ] configs = [ #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", - #"//foundation/appexecfwk/standard/services/formmgr:formmgr_config", + #"${appexecfwk_path}/services/formmgr:formmgr_config", ] cflags = [] if (target_cpu == "arm") { @@ -59,11 +59,11 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", #"${libs_path}/libeventhandler:libeventhandler_target", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn index aabd4eb1419..80f760d6dfc 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn @@ -20,30 +20,30 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/fms_form_mgr_notify_visible_forms_test.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/fms_form_mgr_notify_visible_forms_test.cpp", ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//base/notification/ces_standard/cesfwk/kits/native/include", - "//foundation/aafwk/standard/services/formmgr/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//base/global/resmgr_standard/interfaces/innerkits/include", + "${aafwk_path}/services/formmgr/test/mock/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${aafwk_path}/frameworks/kits/ability/native/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", + "${global_path}/resmgr_standard/interfaces/innerkits/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", ] @@ -56,9 +56,9 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn index 045c0a79a07..37eafbd93e0 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_release_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,8 +45,8 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -58,9 +58,9 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn index d976d90afad..6ffacd722f1 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrRequestFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_request_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,8 +45,8 @@ ohos_unittest("FmsFormMgrRequestFormTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -58,9 +58,9 @@ ohos_unittest("FmsFormMgrRequestFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn index c6845154a87..3d01abea6f5 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_mgr_update_form_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,7 +45,7 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", ] @@ -59,12 +59,12 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", #"${appexecfwk_path}/services/bundlemgr:bms_target", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn index 267bfff9484..68e882cca16 100644 --- a/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn @@ -19,18 +19,18 @@ module_output_path = "form_runtime/formmgrservice" ohos_unittest("FmsFormProviderDataTest") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_provider_data_test/fms_form_provider_data_test.cpp" ] + sources = [ "${aafwk_path}/services/formmgr/test/unittest/fms_form_provider_data_test/fms_form_provider_data_test.cpp" ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", - #"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", ] configs = [] @@ -42,9 +42,9 @@ ohos_unittest("FmsFormProviderDataTest") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", diff --git a/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn index ed747cec792..bcf988e55db 100644 --- a/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormProviderMgrTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_provider_mgr_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,7 +45,7 @@ ohos_unittest("FmsFormProviderMgrTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] @@ -58,10 +58,10 @@ ohos_unittest("FmsFormProviderMgrTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", diff --git a/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn index 96e9e24e505..cfebc29b374 100644 --- a/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn @@ -20,34 +20,34 @@ ohos_unittest("FmsFormSetNextRefreshTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/unittest/fms_form_set_next_refresh_test/fms_form_set_next_refresh_test.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/unittest/fms_form_set_next_refresh_test/fms_form_set_next_refresh_test.cpp", ] include_dirs = [ "//third_party/json/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "//base/notification/ces_standard/cesfwk/kits/native/include", - "//foundation/aafwk/standard/services/formmgr/test/mock/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", + "${aafwk_path}/services/formmgr/test/mock/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", ] configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", #"${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", - #"//foundation/appexecfwk/standard/services/formmgr:formmgr_config", + #"${appexecfwk_path}/services/formmgr:formmgr_config", ] cflags = [] if (target_cpu == "arm") { @@ -59,13 +59,13 @@ ohos_unittest("FmsFormSetNextRefreshTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${services_path}/formmgr:fms_target", "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", #"${libs_path}/libeventhandler:libeventhandler_target", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn index 79fe30c8258..327dddf7949 100644 --- a/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn @@ -20,24 +20,24 @@ ohos_unittest("FmsFormSysEventReceiverTest") { module_out_path = module_output_path sources = [ - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/src/form_mgr.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_bundle_manager.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_host_client.cpp", - "//foundation/aafwk/standard/services/formmgr/test/mock/src/mock_form_provider_client.cpp", + "${aafwk_path}/frameworks/kits/fmskit/native/src/form_mgr.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_bundle_manager.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_host_client.cpp", + "${aafwk_path}/services/formmgr/test/mock/src/mock_form_provider_client.cpp", ] sources += [ "fms_form_sys_event_receiver_test.cpp" ] include_dirs = [ "//third_party/zlib/contrib/minizip", "//third_party/zlib", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${aafwk_path}/frameworks/kits/fmskit/native/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", + "${appexecfwk_path}/services/bundlemgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -45,8 +45,8 @@ ohos_unittest("FmsFormSysEventReceiverTest") { configs = [ "${services_path}/formmgr/test:formmgr_test_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/appexecfwk/standard/services/bundlemgr/test:bundlemgr_test_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", # "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", ] @@ -61,14 +61,14 @@ ohos_unittest("FmsFormSysEventReceiverTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", #"${appexecfwk_path}/services/bundlemgr:bms_target", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_target", + "${aafwk_path}/services/abilitymgr:abilityms_target", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn index e1397cc71ef..46aa0430113 100644 --- a/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn @@ -22,11 +22,11 @@ ohos_unittest("FmsFormTimerMgrTest") { sources = [ "fms_form_timer_mgr_test.cpp" ] include_dirs = [ - "//foundation/appexecfwk/standard/common/log/include/", - "//foundation/aafwk/standard/services/formmgr/include", + "${appexecfwk_path}/common/log/include/", + "${aafwk_path}/services/formmgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include/", + "${aafwk_path}/interfaces/innerkits/form_manager/include", "//base/miscservices/time/interfaces/innerkits/include", ] @@ -40,7 +40,7 @@ ohos_unittest("FmsFormTimerMgrTest") { "${services_path}/formmgr:fms_target", "//base/miscservices/time/services:time_service", "//base/notification/ces_standard/frameworks/common:libevent_common", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] diff --git a/services/test/moduletest/ability_manager_service_dump_test/BUILD.gn b/services/test/moduletest/ability_manager_service_dump_test/BUILD.gn index 39ef82d731d..ab6e4feafb6 100644 --- a/services/test/moduletest/ability_manager_service_dump_test/BUILD.gn +++ b/services/test/moduletest/ability_manager_service_dump_test/BUILD.gn @@ -20,16 +20,16 @@ ohos_moduletest("ability_manager_service_dump_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/services/test/mock/include", + "${aafwk_path}/services/test/mock/include", "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", "ability_manager_service_dump_test.cpp", ] @@ -47,13 +47,13 @@ ohos_moduletest("ability_manager_service_dump_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index 92acf46e0a1..891dc0894bc 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -25,8 +25,8 @@ ohos_moduletest("AbilityRecordModuleTest") { "${EVENT_DIR}/frameworks/core/include", "${EVENT_DIR}/interfaces/innerkits/native/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", ] @@ -63,18 +63,18 @@ ohos_moduletest("AbilityRecordModuleTest") { "${services_path}/abilitymgr/src/want_sender_info.cpp", "${services_path}/abilitymgr/src/want_sender_stub.cpp", "${services_path}/abilitymgr/src/wants_info.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", ] sources += [ "ability_record_module_test.cpp" ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/appexecfwk/standard/common:appexecfwk_common_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:public_libeventhandler_config", + "${appexecfwk_path}/common:appexecfwk_common_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core_config", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:public_libeventhandler_config", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] cflags = [] if (target_cpu == "arm") { @@ -87,12 +87,12 @@ ohos_moduletest("AbilityRecordModuleTest") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -108,9 +108,9 @@ ohos_moduletest("AbilityRecordModuleTest") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", "//third_party/libpng:libpng", ] defines = [ "SUPPORT_GRAPHICS" ] diff --git a/services/test/moduletest/ability_timeout_module_test/BUILD.gn b/services/test/moduletest/ability_timeout_module_test/BUILD.gn index 03ee4fc7f44..f67ec4e8229 100644 --- a/services/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/services/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -23,53 +23,53 @@ ohos_moduletest("ability_timeout_module_test") { include_dirs = [ "${services_path}/test/mock/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", ] sources = [ "ability_timeout_module_test.cpp" ] sources += [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_event_handler.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_service.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_token_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/call_container.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/call_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/caller_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/connection_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_deal.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_snapshot.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_key.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_receiver_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/wants_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_bundle_mgr.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_event_handler.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_service.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record_info.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_token_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/call_container.cpp", + "${aafwk_path}/services/abilitymgr/src/call_record.cpp", + "${aafwk_path}/services/abilitymgr/src/caller_info.cpp", + "${aafwk_path}/services/abilitymgr/src/connection_record.cpp", + "${aafwk_path}/services/abilitymgr/src/data_ability_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/data_ability_record.cpp", + "${aafwk_path}/services/abilitymgr/src/launch_param.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_deal.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_state_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_snapshot.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_key.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_record.cpp", + "${aafwk_path}/services/abilitymgr/src/sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_receiver_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/wants_info.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_bundle_mgr.cpp", ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", ] cflags = [] @@ -82,13 +82,13 @@ ohos_moduletest("ability_timeout_module_test") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -104,9 +104,9 @@ ohos_moduletest("ability_timeout_module_test") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", "//third_party/libpng:libpng", ] } diff --git a/services/test/moduletest/call_module_test/BUILD.gn b/services/test/moduletest/call_module_test/BUILD.gn index 2b417108397..927dcd2395f 100644 --- a/services/test/moduletest/call_module_test/BUILD.gn +++ b/services/test/moduletest/call_module_test/BUILD.gn @@ -19,16 +19,16 @@ ohos_moduletest("call_ability_service_module_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/services/test/mock/include", + "${aafwk_path}/services/test/mock/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ # add mock file - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "call_ability_service_module_test.cpp", ] @@ -44,13 +44,13 @@ ohos_moduletest("call_ability_service_module_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/test/moduletest/common/ams/BUILD.gn b/services/test/moduletest/common/ams/BUILD.gn index 88e24066bff..358df119ea8 100644 --- a/services/test/moduletest/common/ams/BUILD.gn +++ b/services/test/moduletest/common/ams/BUILD.gn @@ -19,7 +19,7 @@ config("appmgr_test_config") { "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "//base/notification/ces_standard/frameworks/core/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", - "//base/global/i18n/frameworks/intl/include", + "${global_path}/i18n/frameworks/intl/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", ] } @@ -65,10 +65,10 @@ ohos_source_set("appmgr_mst_source") { "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:bundlemgr_sdk_config", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:public_libeventhandler_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", - "//foundation/aafwk/standard/interfaces/innerkits/base:base_public_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core_config", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:public_libeventhandler_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", + "${aafwk_path}/interfaces/innerkits/base:base_public_config", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy_config", "//utils/native/base:utils_config", "//third_party/googletest:gtest_config", @@ -85,10 +85,10 @@ ohos_source_set("appmgr_mst_source") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn b/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn index 868eaa1e9c8..346641df158 100644 --- a/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn @@ -28,7 +28,7 @@ ohos_moduletest("AmsAppLifeCycleModuleTest") { deps = [ "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", ] external_deps = [ diff --git a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn index 516a2d14af5..bfec097cae3 100644 --- a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_moduletest("AmsAppMgrServiceModuleTest") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] sources = [ - "//foundation/aafwk/standard/services/appmgr/src/system_environment_information.cpp", + "${aafwk_path}/services/appmgr/src/system_environment_information.cpp", "ams_app_mgr_service_module_test.cpp", ] @@ -34,7 +34,7 @@ ohos_moduletest("AmsAppMgrServiceModuleTest") { ] if (ability_runtime_graphics) { - deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } external_deps = [ 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 3dc2905cd80..d4c9ea9b5d6 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,12 +20,12 @@ ohos_moduletest("AmsIpcAmsmgrModuleTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/appmgr/include", + "${aafwk_path}/interfaces/innerkits/base/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${aafwk_path}/interfaces/innerkits/want/include", + "${aafwk_path}/services/appmgr/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] sources = [ "ams_ipc_ams_mgr_module_test.cpp" ] diff --git a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn index 27879bbe0af..63ee40f37af 100644 --- a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn @@ -25,7 +25,7 @@ ohos_moduletest("AmsServiceAppSpawnClientModuleTest") { defines = [ "usleep(time) = MockSleep(time)" ] sources = [ - "//foundation/aafwk/standard/services/appmgr/src/system_environment_information.cpp", + "${aafwk_path}/services/appmgr/src/system_environment_information.cpp", "ams_service_app_spawn_client_module_test.cpp", ] @@ -35,7 +35,7 @@ ohos_moduletest("AmsServiceAppSpawnClientModuleTest") { ] if (ability_runtime_graphics) { - deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } external_deps = [ diff --git a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn index 829ed019b47..cc565acaeab 100644 --- a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn @@ -36,7 +36,7 @@ ohos_moduletest("AmsServiceEventDriveModuleTest") { ] if (ability_runtime_graphics) { - deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } external_deps = [ diff --git a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn index e5a75f35ac6..ab53434f035 100644 --- a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn @@ -33,7 +33,7 @@ ohos_moduletest("AmsServiceStartModuleTest") { ] if (ability_runtime_graphics) { - deps += [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps += [ "${global_path}/i18n/frameworks/intl:intl_util" ] } external_deps = [ diff --git a/services/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/services/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn index af9f3ed2cae..12f2d8d4224 100644 --- a/services/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/services/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -23,27 +23,27 @@ ohos_moduletest("specified_ability_service_test") { include_dirs = [ "${services_path}/test/mock/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", ] sources = [ "specified_ability_service_test.cpp" ] sources += [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_service.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_bundle_mgr.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_service.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_bundle_mgr.cpp", "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp", ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", ] cflags = [] @@ -54,13 +54,13 @@ ohos_moduletest("specified_ability_service_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -76,9 +76,9 @@ ohos_moduletest("specified_ability_service_test") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", "//third_party/libpng:libpng", ] } diff --git a/services/test/moduletest/dump_module_test/BUILD.gn b/services/test/moduletest/dump_module_test/BUILD.gn index e566c5e1d1f..0802e22d51f 100644 --- a/services/test/moduletest/dump_module_test/BUILD.gn +++ b/services/test/moduletest/dump_module_test/BUILD.gn @@ -22,21 +22,21 @@ ohos_moduletest("dump_module_test") { include_dirs = [ "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util/", - "//foundation/aafwk/standard/services/test/mock/include", + "${aafwk_path}/services/test/moduletest/module_test_dump_util/", + "${aafwk_path}/services/test/mock/include", ] sources = [ "${services_path}/abilitymgr/test/unittest/phone/ability_with_applications_test/mock_ability_scheduler.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/app_scheduler.cpp", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util/module_test_dump_util.cpp", + "${aafwk_path}/services/abilitymgr/src/app_scheduler.cpp", + "${aafwk_path}/services/test/moduletest/module_test_dump_util/module_test_dump_util.cpp", "dump_module_test.cpp", ] configs = [ "${services_path}/abilitymgr:abilityms_config", "${services_path}/abilitymgr/test/mock:aafwk_mock_config", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_config", + "${aafwk_path}/services/test/moduletest/module_test_dump_util:module_test_dump_util_config", ] cflags = [] if (target_cpu == "arm") { @@ -51,11 +51,11 @@ ohos_moduletest("dump_module_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -63,7 +63,7 @@ ohos_moduletest("dump_module_test") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//third_party/libpng:libpng", ] } diff --git a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn index b5da03e48e8..d00927ae013 100644 --- a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -33,7 +33,7 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { deps = [ "${innerkits_path}/want:want", "${services_path}/common:perm_verification", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utilsbase", diff --git a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn index 033b641e076..6a2d11095ed 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/appexecfwk/standard/common:appexecfwk_common_config", + "${appexecfwk_path}/common:appexecfwk_common_config", "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", ] cflags = [] @@ -36,8 +36,8 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { "${innerkits_path}/uri:zuri", "${innerkits_path}/want:want", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index 84091db71b1..41b0e906713 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -22,7 +22,7 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { include_dirs = [ "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", ] sources = [ @@ -30,16 +30,16 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { "${services_path}/abilitymgr/src/ability_scheduler_stub.cpp", "${services_path}/abilitymgr/src/caller_info.cpp", "${services_path}/abilitymgr/src/lifecycle_state_info.cpp", - "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/pac_map.cpp", - "//foundation/appexecfwk/standard/common/log/src/app_log_wrapper.cpp", + "${aafwk_path}/frameworks/kits/content/cpp/src/ohos/aafwk/content/pac_map.cpp", + "${appexecfwk_path}/common/log/src/app_log_wrapper.cpp", ] sources += [ "ipc_ability_scheduler_module_test.cpp" ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/appexecfwk/standard/common:appexecfwk_common_config", - "//foundation/aafwk/standard/interfaces/innerkits/want:want_public_config", + "${appexecfwk_path}/common:appexecfwk_common_config", + "${aafwk_path}/interfaces/innerkits/want:want_public_config", ] cflags = [] if (target_cpu == "arm") { @@ -49,11 +49,11 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { "${innerkits_path}/uri:zuri", "${innerkits_path}/want:want", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/services/test/moduletest/mission_dump_test/BUILD.gn b/services/test/moduletest/mission_dump_test/BUILD.gn index 01499db7ba3..a342e80ea4b 100644 --- a/services/test/moduletest/mission_dump_test/BUILD.gn +++ b/services/test/moduletest/mission_dump_test/BUILD.gn @@ -23,14 +23,14 @@ ohos_moduletest("mission_dump_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ "mission_dump_test.cpp" ] sources += [ - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp", ] @@ -45,13 +45,13 @@ ohos_moduletest("mission_dump_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/services/test/moduletest/module_test_dump_util/BUILD.gn b/services/test/moduletest/module_test_dump_util/BUILD.gn index 2a055106932..770ac9bee8e 100644 --- a/services/test/moduletest/module_test_dump_util/BUILD.gn +++ b/services/test/moduletest/module_test_dump_util/BUILD.gn @@ -20,11 +20,11 @@ group("module_test_dump_util") { } config("module_test_dump_util_config") { - include_dirs = [ "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util/" ] + include_dirs = [ "${aafwk_path}/services/test/moduletest/module_test_dump_util/" ] } ohos_shared_library("module_test_dump_util_lib") { - sources = [ "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util/module_test_dump_util.cpp" ] + sources = [ "${aafwk_path}/services/test/moduletest/module_test_dump_util/module_test_dump_util.cpp" ] configs = [ ":module_test_dump_util_config" ] diff --git a/services/test/moduletest/on_new_want_module_test/BUILD.gn b/services/test/moduletest/on_new_want_module_test/BUILD.gn index 4bd884a0567..8fe514165b2 100644 --- a/services/test/moduletest/on_new_want_module_test/BUILD.gn +++ b/services/test/moduletest/on_new_want_module_test/BUILD.gn @@ -23,25 +23,25 @@ ohos_moduletest("on_new_want_module_test") { include_dirs = [ "${services_path}/test/mock/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", ] sources = [ "on_new_want_module_test.cpp" ] sources += [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_service.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_list.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_list_manager.cpp", - "//foundation/aafwk/standard/services/common/src/permission_verification.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_service.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_list.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_list_manager.cpp", + "${aafwk_path}/services/common/src/permission_verification.cpp", "//foundation/distributedhardware/devicemanager/test/unittest/mock/parameter.cpp", ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", ] cflags = [] @@ -52,13 +52,13 @@ ohos_moduletest("on_new_want_module_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -74,9 +74,9 @@ ohos_moduletest("on_new_want_module_test") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", "//third_party/libpng:libpng", ] } diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn index a6f3f70e479..9e477b7569f 100644 --- a/services/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn @@ -22,10 +22,10 @@ ohos_moduletest("PandingWantMgrTest") { module_out_path = module_output_path cflags_cc = [] include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/services/test/mock/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/appmg", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", + "${aafwk_path}/services/test/mock/include", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/appmg", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", "//third_party/jsoncpp/include", @@ -34,11 +34,11 @@ ohos_moduletest("PandingWantMgrTest") { sources = abilityms_files sources += [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_client.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_bundle_mgr.cpp", - "//foundation/appexecfwk/standard/common/log/src/app_log_wrapper.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_client.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_bundle_mgr.cpp", + "${appexecfwk_path}/common/log/src/app_log_wrapper.cpp", "panding_want_manager_test.cpp", ] @@ -55,13 +55,13 @@ ohos_moduletest("PandingWantMgrTest") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -94,9 +94,9 @@ ohos_moduletest("PandingWantMgrTest") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/graphic/standard:libwmservice", + "${graphic_path}/standard:libwmservice", "//third_party/libpng:libpng", ] diff --git a/services/test/moduletest/running_infos_module_test/BUILD.gn b/services/test/moduletest/running_infos_module_test/BUILD.gn index ee1a898f062..8c740f9c96c 100644 --- a/services/test/moduletest/running_infos_module_test/BUILD.gn +++ b/services/test/moduletest/running_infos_module_test/BUILD.gn @@ -23,49 +23,49 @@ ohos_moduletest("running_infos_module_test") { include_dirs = [ "${services_path}/test/mock/include", "//third_party/jsoncpp/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/distributed_ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/distributed_ability_runtime", + "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", ] sources = [ "running_infos_module_test.cpp" ] sources += [ - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_event_handler.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_service.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_manager_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_record_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_proxy.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_scheduler_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/ability_token_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/caller_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/connection_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_deal.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/mission_snapshot.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_key.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_manager.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/pending_want_record.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_receiver_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/want_sender_stub.cpp", - "//foundation/aafwk/standard/services/abilitymgr/src/wants_info.cpp", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_app_mgr_client.cpp", - "//foundation/aafwk/standard/services/test/mock/src/mock_bundle_mgr.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_connect_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_event_handler.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_service.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_manager_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_record_info.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_proxy.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_scheduler_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/ability_token_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/caller_info.cpp", + "${aafwk_path}/services/abilitymgr/src/connection_record.cpp", + "${aafwk_path}/services/abilitymgr/src/data_ability_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/data_ability_record.cpp", + "${aafwk_path}/services/abilitymgr/src/launch_param.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_deal.cpp", + "${aafwk_path}/services/abilitymgr/src/lifecycle_state_info.cpp", + "${aafwk_path}/services/abilitymgr/src/mission_snapshot.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_key.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_manager.cpp", + "${aafwk_path}/services/abilitymgr/src/pending_want_record.cpp", + "${aafwk_path}/services/abilitymgr/src/sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_receiver_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_info.cpp", + "${aafwk_path}/services/abilitymgr/src/want_sender_stub.cpp", + "${aafwk_path}/services/abilitymgr/src/wants_info.cpp", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr/src/sa_mgr_client_mock.cpp", + "${aafwk_path}/services/test/mock/src/mock_app_mgr_client.cpp", + "${aafwk_path}/services/test/mock/src/mock_bundle_mgr.cpp", ] configs = [ "${services_path}/test:aafwk_module_test_config", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config", - "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config", + "${aafwk_path}/services/abilitymgr/test/mock/libs/sa_mgr:sa_mgr_mock_config", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base_sdk_config", "${aafwk_path}/interfaces/innerkits/app_manager:appmgr_sdk_config", ] cflags = [] @@ -78,13 +78,13 @@ ohos_moduletest("running_infos_module_test") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -100,9 +100,9 @@ ohos_moduletest("running_infos_module_test") { if (ability_runtime_graphics) { deps += [ - "//base/global/i18n/frameworks/intl:intl_util", + "${global_path}/i18n/frameworks/intl:intl_util", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "${multimedia_path}/image_standard/interfaces/innerkits:image_native", "//third_party/libpng:libpng", ] } diff --git a/services/test/moduletest/start_option_display_id_test/BUILD.gn b/services/test/moduletest/start_option_display_id_test/BUILD.gn index 0ae27f28aee..85bc129058d 100644 --- a/services/test/moduletest/start_option_display_id_test/BUILD.gn +++ b/services/test/moduletest/start_option_display_id_test/BUILD.gn @@ -23,8 +23,8 @@ ohos_moduletest("start_option_display_id_test") { "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/frameworks/kits/ability/native/test/mock/include", ] sources = [ "start_option_display_id_test.cpp" ] @@ -41,13 +41,13 @@ ohos_moduletest("start_option_display_id_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", diff --git a/test/fuzztest/AcquireDataAbility_fuzzer/BUILD.gn b/test/fuzztest/AcquireDataAbility_fuzzer/BUILD.gn index 7dcd03b6404..bae997cad5a 100644 --- a/test/fuzztest/AcquireDataAbility_fuzzer/BUILD.gn +++ b/test/fuzztest/AcquireDataAbility_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("AcquireDataAbilityFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("AcquireDataAbilityFuzzTest") { sources = [ "AcquireDataAbility_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", ] external_deps = [ diff --git a/test/fuzztest/CompelVerifyPermission_fuzzer/BUILD.gn b/test/fuzztest/CompelVerifyPermission_fuzzer/BUILD.gn index 57d97d436b0..0fdd39a438f 100644 --- a/test/fuzztest/CompelVerifyPermission_fuzzer/BUILD.gn +++ b/test/fuzztest/CompelVerifyPermission_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("CompelVerifyPermissionFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", ] cflags = [ @@ -35,13 +35,13 @@ ohos_fuzztest("CompelVerifyPermissionFuzzTest") { sources = [ "CompelVerifyPermission_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", ] external_deps = [ "ipc:ipc_core" ] diff --git a/test/fuzztest/FinishUserTest_fuzzer/BUILD.gn b/test/fuzztest/FinishUserTest_fuzzer/BUILD.gn index 78bed53bb59..efd0dce12c2 100644 --- a/test/fuzztest/FinishUserTest_fuzzer/BUILD.gn +++ b/test/fuzztest/FinishUserTest_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("FinishUserTestFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("FinishUserTestFuzzTest") { sources = [ "FinishUserTest_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_delegator", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_delegator", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", ] } diff --git a/test/fuzztest/GetWantSender_fuzzer/BUILD.gn b/test/fuzztest/GetWantSender_fuzzer/BUILD.gn index f3bb9878c4d..55c640959bb 100644 --- a/test/fuzztest/GetWantSender_fuzzer/BUILD.gn +++ b/test/fuzztest/GetWantSender_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("GetWantSenderFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("GetWantSenderFuzzTest") { sources = [ "GetWantSender_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", ] external_deps = [ diff --git a/test/fuzztest/SetMissionLabel_fuzzer/BUILD.gn b/test/fuzztest/SetMissionLabel_fuzzer/BUILD.gn index 4cb52e12f7e..42da056bf99 100644 --- a/test/fuzztest/SetMissionLabel_fuzzer/BUILD.gn +++ b/test/fuzztest/SetMissionLabel_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("SetMissionLabelFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("SetMissionLabelFuzzTest") { sources = [ "SetMissionLabel_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", ] external_deps = [ diff --git a/test/fuzztest/StartAbility_fuzzer/BUILD.gn b/test/fuzztest/StartAbility_fuzzer/BUILD.gn index 2c8865d926f..f6e117f9ce3 100644 --- a/test/fuzztest/StartAbility_fuzzer/BUILD.gn +++ b/test/fuzztest/StartAbility_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("StartAbilityFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("StartAbilityFuzzTest") { sources = [ "StartAbility_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", ] external_deps = [ diff --git a/test/fuzztest/StartContinuation_fuzzer/BUILD.gn b/test/fuzztest/StartContinuation_fuzzer/BUILD.gn index d7371efeedc..07ecbfc5229 100644 --- a/test/fuzztest/StartContinuation_fuzzer/BUILD.gn +++ b/test/fuzztest/StartContinuation_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("StartContinuationFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,14 +36,14 @@ ohos_fuzztest("StartContinuationFuzzTest") { sources = [ "StartContinuation_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", ] external_deps = [ diff --git a/test/fuzztest/StopServiceAbility_fuzzer/BUILD.gn b/test/fuzztest/StopServiceAbility_fuzzer/BUILD.gn index cfd5be5a653..96c8cc4900b 100644 --- a/test/fuzztest/StopServiceAbility_fuzzer/BUILD.gn +++ b/test/fuzztest/StopServiceAbility_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("StopServiceAbilityFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/frameworks/kits/ability/native/include/", ] cflags = [ @@ -36,13 +36,13 @@ ohos_fuzztest("StopServiceAbilityFuzzTest") { sources = [ "StopServiceAbility_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", ] } diff --git a/test/fuzztest/UpdateConfiguration_fuzzer/BUILD.gn b/test/fuzztest/UpdateConfiguration_fuzzer/BUILD.gn index fa3ff031c73..0ccdf812a7f 100644 --- a/test/fuzztest/UpdateConfiguration_fuzzer/BUILD.gn +++ b/test/fuzztest/UpdateConfiguration_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("UpdateConfigurationFuzzTest") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", ] cflags = [ @@ -35,13 +35,13 @@ ohos_fuzztest("UpdateConfigurationFuzzTest") { sources = [ "UpdateConfiguration_fuzzer.cpp" ] - configs = [ "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager_public_config" ] + configs = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager_public_config" ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", ] external_deps = [ diff --git a/test/fuzztest/WantAgentHelperString_fuzzer/BUILD.gn b/test/fuzztest/WantAgentHelperString_fuzzer/BUILD.gn index 5716ca5e795..32b8d14493a 100644 --- a/test/fuzztest/WantAgentHelperString_fuzzer/BUILD.gn +++ b/test/fuzztest/WantAgentHelperString_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") { module_out_path = module_output_path include_dirs = - [ "//foundation/aafwk/standard/interfaces/innerkits/wantagent/include" ] + [ "${aafwk_path}/interfaces/innerkits/wantagent/include" ] cflags = [ "-g", @@ -35,7 +35,7 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") { sources = [ "WantAgentHelperString_fuzzer.cpp" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", ] external_deps = [ diff --git a/test/fuzztest/WantAgentHelperTrigger_fuzzer/BUILD.gn b/test/fuzztest/WantAgentHelperTrigger_fuzzer/BUILD.gn index e7dd63d5da6..c3735b7a23a 100644 --- a/test/fuzztest/WantAgentHelperTrigger_fuzzer/BUILD.gn +++ b/test/fuzztest/WantAgentHelperTrigger_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") { module_out_path = module_output_path include_dirs = - [ "//foundation/aafwk/standard/interfaces/innerkits/wantagent/include" ] + [ "${aafwk_path}/interfaces/innerkits/wantagent/include" ] cflags = [ "-g", @@ -35,7 +35,7 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") { sources = [ "WantAgentHelperTrigger_fuzzer.cpp" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", ] external_deps = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn index 0770df4757b..75ec576f4dd 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn @@ -11,24 +11,26 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityVisibleTestPageAConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", - "//foundation/appexecfwk/standard/kits/appkit/native/app", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${appexecfwk_path}/kits/appkit/native/app", + "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -46,16 +48,16 @@ ohos_shared_library("amsAbilityVisibleTestPageA") { ] configs = [ ":amsAbilityVisibleTestPageAConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn index cae6dbc2d4a..80beb4fa03b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn @@ -11,23 +11,25 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityVisibleTestServiceBConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -46,16 +48,16 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") { ] configs = [ ":amsAbilityVisibleTestServiceBConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:app_context", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index a375339425d..9206ee0695e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -13,21 +13,23 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,14 +51,14 @@ ohos_shared_library("amsDataSystemTestB") { ] configs = [ ":amsDataSystemTestBConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index d56ccf6f7ad..f10ed1ea4d0 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -13,21 +13,23 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,14 +51,14 @@ ohos_shared_library("amsDataSystemTestC") { ] configs = [ ":amsDataSystemTestCConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb:native_rdb", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn index 121b77c08eb..afd27aae434 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn @@ -13,22 +13,22 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsStDataAbility" +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsStDataAbility" EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("verify_act_ability_config") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${EVENT_DIR}/kits/native/include", ] defines = [ @@ -52,14 +52,14 @@ ohos_shared_library("amsStDataAbility") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", "//base/notification/ces_standard/interfaces/kits/napi/common_event:commonevent", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/uri:zuri", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn index 3d2e268ffcc..46baadb0933 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestA" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestA" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,13 +48,13 @@ ohos_shared_library("amsSystemTestA") { ] configs = [ ":amsSystemTestAConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn index bca9a7c5f76..450231ac248 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestB" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestB" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestB") { ] configs = [ ":amsSystemTestBConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn index 546df0f1699..c9f1102cb34 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestC" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestC" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -43,13 +45,13 @@ ohos_shared_library("amsSystemTestC") { ] configs = [ ":amsSystemTestCConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn index b36c8da0f66..c76cfdb3e70 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestD" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestD" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestDConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -42,13 +44,13 @@ ohos_shared_library("amsSystemTestD") { ] configs = [ ":amsSystemTestDConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn index 0c22a3b711b..7f6133a6a67 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn @@ -51,7 +51,7 @@ ohos_shared_library("amsSystemTestDFX") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn index 4e31381570e..5fa73836546 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestE" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestE" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestEConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestE") { ] configs = [ ":amsSystemTestEConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn index 9a47f73d27e..b6e2e17c55b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn @@ -11,20 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK" config("amsSystemTestErrorKConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -36,13 +38,13 @@ ohos_shared_library("amsSystemTestErrorK") { sources = [ "${SUBDEMOSYSTEM_DIR}/src/amsstabilityerrork1.cpp" ] configs = [ ":amsSystemTestErrorKConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn index 70a33d2ea42..9910ce1dea6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn @@ -11,20 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL" config("amsSystemTestErrorLConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -36,13 +38,13 @@ ohos_shared_library("amsSystemTestErrorL") { sources = [ "${SUBDEMOSYSTEM_DIR}/src/amsstabilityerrorl1.cpp" ] configs = [ ":amsSystemTestErrorLConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn index 2360c8a4d57..3cea2d2dca2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestF" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestF" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestFConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -43,13 +45,13 @@ ohos_shared_library("amsSystemTestF") { ] configs = [ ":amsSystemTestFConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn index 6929a4cc76d..679cb918a27 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestG" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestG" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestGConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -42,13 +44,13 @@ ohos_shared_library("amsSystemTestG") { ] configs = [ ":amsSystemTestGConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn index 19084e6ead1..cbf8c769a01 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestH" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestH" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestHConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestH") { ] configs = [ ":amsSystemTestHConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn index 7063ad122f4..b67d7b04667 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestI" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestI" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestIConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -44,13 +46,13 @@ ohos_shared_library("amsSystemTestI") { ] configs = [ ":amsSystemTestIConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn index 26d3dd95013..455ec0429c8 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestM" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestM" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestMConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestM") { ] configs = [ ":amsSystemTestMConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn index 657255aad37..d39b410d946 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestN" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestN" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestNConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -44,13 +46,13 @@ ohos_shared_library("amsSystemTestN") { ] configs = [ ":amsSystemTestNConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn index 8571add5f07..ed0b7b7e24f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestO" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestO" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestOConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestO") { ] configs = [ ":amsSystemTestOConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn index fe271849fb0..dd7c2851a7f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestP" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestP" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestPConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -41,13 +43,13 @@ ohos_shared_library("amsSystemTestP") { ] configs = [ ":amsSystemTestPConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn index ab19ed7876b..71e3af5cf5c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestQConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -44,13 +46,13 @@ ohos_shared_library("amsSystemTestQ") { ] configs = [ ":amsSystemTestQConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn index c967c50c881..82aab495e52 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestR" -SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestR" +SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestRConfig") { visibility = [ ":*" ] include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -44,13 +46,13 @@ ohos_shared_library("amsSystemTestR") { ] configs = [ ":amsSystemTestRConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn index b3abe3e871a..3736bb33685 100644 --- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn @@ -11,21 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -APP_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/fwkAbilityState" -TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" +import("//foundation/aafwk/standard/aafwk.gni") + +APP_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/fwkAbilityState" +TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ "${APP_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/uri/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/services/bundlemgr/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_path}/frameworks/kits/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/uri/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/services/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "//foundation/appexecfwk/standard/common/log/include", + "${appexecfwk_path}/common/log/include", "${TOOLS_DIR}/include", ] defines = [ @@ -46,13 +48,13 @@ ohos_shared_library("fwkAbilityState") { ] configs = [ ":amsSystemTestAConfig" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/services/bundlemgr:libbms", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ diff --git a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn index 45fc7d3ac2b..90e8f8ab6cc 100644 --- a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn @@ -13,6 +13,8 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") + SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/serviceAbilityA" config("service_ability_a_config") { @@ -37,9 +39,9 @@ ohos_shared_library("serviceAbilityA") { configs = [ ":service_ability_a_config" ] deps = [ "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/appexecfwk/standard/common:libappexecfwk_common", + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${appexecfwk_path}/common:libappexecfwk_common", ] external_deps = [ "ability_base:want", diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn index b910da0f538..2fe551ac9a7 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn @@ -29,7 +29,7 @@ config("taskDispatcherTestAConfig") { "${common_path}/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher/include", ] defines = [ "AMS_LOG_TAG = \"taskDispatcherTestA\"", @@ -45,11 +45,11 @@ ohos_shared_library("taskDispatcherTestA") { "${SUBDEMOSYSTEM_DIR}/src/main_ability.cpp", "${SUBDEMOSYSTEM_DIR}/src/second_ability.cpp", "${SUBDEMOSYSTEM_DIR}/src/test_utils.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/src/task_dispatcher_tools.cpp", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher/src/task_dispatcher_tools.cpp", ] configs = [ ":taskDispatcherTestAConfig", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", ] deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn index faba4c317db..db23d5fa9a0 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn @@ -29,7 +29,7 @@ config("taskDispatcherTestBConfig") { "${common_path}/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher/include", ] defines = [ "AMS_LOG_TAG = \"taskDispatcherTestB\"", @@ -46,11 +46,11 @@ ohos_shared_library("taskDispatcherTestB") { "${SUBDEMOSYSTEM_DIR}/src/main_ability.cpp", "${SUBDEMOSYSTEM_DIR}/src/second_ability.cpp", "${SUBDEMOSYSTEM_DIR}/src/test_utils.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/src/task_dispatcher_tools.cpp", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher/src/task_dispatcher_tools.cpp", ] configs = [ ":taskDispatcherTestBConfig", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", ] deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn b/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn index b32615d6c1b..ab42f124587 100644 --- a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemPerformanceConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemPerformanceConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("fmsSystemPerformance") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn b/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn index 74f2dc0e0d3..0c272c55d7d 100644 --- a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemStressConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemStressConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("fmsSystemStress") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn index 5e66942fd4d..b04b9412818 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostCommonAConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostCommonAConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -59,7 +60,7 @@ ohos_shared_library("fmsSystemTestHostCommonA") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn index 2cfb9148738..b2ade9f4a46 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostCommonBConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostCommonBConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -59,7 +60,7 @@ ohos_shared_library("fmsSystemTestHostCommonB") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn index 0f47fbd9600..1d42ec0065b 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostNoPermConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostNoPermConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("fmsSystemTestHostNoPerm") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn index fc18b6eb065..aa0f06c34cd 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostNormalConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostNormalConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -61,7 +62,7 @@ ohos_shared_library("fmsSystemTestHostNormal") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn index d2408ef7005..9ef25770ce6 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostNormalBConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostNormalBConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -59,7 +60,7 @@ ohos_shared_library("fmsSystemTestHostNormalB") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn index 02997f81754..30c46cd809d 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostNormalCConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostNormalCConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] @@ -59,7 +60,7 @@ ohos_shared_library("fmsSystemTestHostNormalC") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn index 3b1e9a150ec..fa4fc46dc51 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("fmsSystemTestHostNotSysConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("fmsSystemTestHostNotSysConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("fmsSystemTestHostNotSys") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn index b9d11fb1f72..29e5accda78 100644 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("selfStartingTestHostAConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("selfStartingTestHostAConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("selfStartingTestHostA") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn index 88d87e2cfa3..cf825cb29c1 100644 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("selfStartingTestHostBConfig") { visibility = [ ":*" ] @@ -28,7 +29,7 @@ config("selfStartingTestHostBConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", + "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", "//third_party/jsoncpp/include", ] defines = [ @@ -55,8 +56,8 @@ ohos_shared_library("selfStartingTestHostB") { "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/services/bundlemgr:libbms", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] diff --git a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn index 894deeda531..bd0c603a3b0 100644 --- a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/ams" @@ -20,22 +21,22 @@ ohos_systemtest("ams_aa_command_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/aafwk/standard/tools/aa/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${aafwk_path}/tools/aa/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_aa_command_test.cpp", ] configs = [ - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", "${aafwk_path}/services/appmgr:appmgr_config", ] cflags = [] @@ -44,10 +45,10 @@ ohos_systemtest("ams_aa_command_test") { } deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn index 31b8600f62d..59365a98476 100644 --- a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn @@ -19,16 +19,16 @@ ohos_systemtest("ams_ability_append_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", - "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${distributedschedule_path}/safwk/services/safwk/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_append_test.cpp", ] @@ -46,7 +46,7 @@ ohos_systemtest("ams_ability_append_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", 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 4b58dea8323..01575176cf6 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 @@ -14,11 +14,12 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/ams/" config("system_test_ams_ability_state_age_manual_test_config") { include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", @@ -38,15 +39,15 @@ ohos_systemtest("ams_ability_state_age_manual_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_state_age_manual_test.cpp", ] @@ -54,11 +55,11 @@ ohos_systemtest("ams_ability_state_age_manual_test") { "${aafwk_path}/services/abilitymgr:abilityms_config", "${aafwk_path}/services/appmgr:appmgr_config", - # "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_config", + # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":system_test_ams_ability_state_age_manual_test_config", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/:system_test_ability_util_config", - "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_config", + "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] if (target_cpu == "arm") { @@ -70,8 +71,8 @@ ohos_systemtest("ams_ability_state_age_manual_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", 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 edb83421c35..b3f659be66c 100644 --- a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn @@ -14,11 +14,12 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/ams/" config("system_test_ams_ability_state_test_config") { include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", @@ -38,15 +39,15 @@ ohos_systemtest("ams_ability_state_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_state_test.cpp", ] @@ -54,11 +55,11 @@ ohos_systemtest("ams_ability_state_test") { "${aafwk_path}/services/abilitymgr:abilityms_config", "${aafwk_path}/services/appmgr:appmgr_config", - # "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_config", + # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":system_test_ams_ability_state_test_config", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/:system_test_ability_util_config", - "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_config", + "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] if (target_cpu == "arm") { @@ -70,8 +71,8 @@ ohos_systemtest("ams_ability_state_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn index 9b28a1017b1..d107758ef8d 100644 --- a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn @@ -18,17 +18,17 @@ ohos_systemtest("ams_ability_visible_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/safwk/services/safwk/include", + "${distributedschedule_path}/safwk/services/safwk/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_visible_test.cpp", ] @@ -46,7 +46,7 @@ ohos_systemtest("ams_ability_visible_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn index 30d060c6fd4..af5dab73950 100644 --- a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn @@ -18,17 +18,17 @@ ohos_systemtest("ams_app_process_manage_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/safwk/services/safwk/include", + "${distributedschedule_path}/safwk/services/safwk/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_app_process_manage_test.cpp", ] @@ -46,7 +46,7 @@ ohos_systemtest("ams_app_process_manage_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", @@ -59,7 +59,7 @@ ohos_systemtest("ams_app_process_manage_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] - resource_config_file = "//foundation/appexecfwk/standard/test/resource/mstbundlemgrservice/ohos_test.xml" + resource_config_file = "${appexecfwk_path}/test/resource/mstbundlemgrservice/ohos_test.xml" } group("systemtest") { diff --git a/test/systemtest/common/ams/ams_check_service/BUILD.gn b/test/systemtest/common/ams/ams_check_service/BUILD.gn index 9db8e7a1872..a1b716dc0f2 100644 --- a/test/systemtest/common/ams/ams_check_service/BUILD.gn +++ b/test/systemtest/common/ams/ams_check_service/BUILD.gn @@ -14,11 +14,12 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/ams/" config("ams_check_service_config") { include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", @@ -38,15 +39,15 @@ ohos_systemtest("ams_check_service") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "access_control_check.cpp", ] @@ -54,10 +55,10 @@ ohos_systemtest("ams_check_service") { "${aafwk_path}/services/abilitymgr:abilityms_config", "${aafwk_path}/services/appmgr:appmgr_config", - # "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_config", + # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":ams_check_service_config", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/:system_test_ability_util_config", - "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_config", + "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] if (target_cpu == "arm") { @@ -69,8 +70,8 @@ ohos_systemtest("ams_check_service") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn index e656d9fa12a..4f6cb867e69 100644 --- a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn @@ -18,17 +18,17 @@ ohos_systemtest("ams_configuration_updated_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/safwk/services/safwk/include", + "${distributedschedule_path}/safwk/services/safwk/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_configuration_updated_test.cpp", ] @@ -46,7 +46,7 @@ ohos_systemtest("ams_configuration_updated_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn index a11db7f64ed..b1dac1da798 100644 --- a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn @@ -20,16 +20,16 @@ ohos_systemtest("ams_data_ability_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${distributedschedule_path}/safwk/services/safwk/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_data_ability_test.cpp", ] @@ -49,7 +49,7 @@ ohos_systemtest("ams_data_ability_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn index c45050efe71..a5c1992c0c1 100644 --- a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn @@ -18,17 +18,17 @@ ohos_systemtest("ams_dfx_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/safwk/services/safwk/include", + "${distributedschedule_path}/safwk/services/safwk/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_dfx_test.cpp", ] @@ -46,7 +46,7 @@ ohos_systemtest("ams_dfx_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn index d76f91e6278..72b9a06e072 100644 --- a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn @@ -20,16 +20,16 @@ ohos_systemtest("ams_service_ability_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/distributedschedule/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${distributedschedule_path}/services/safwk/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_service_ability_test.cpp", ] @@ -47,8 +47,8 @@ ohos_systemtest("ams_service_ability_test") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn index 0fb9955a93d..e7a2af6a8f1 100644 --- a/test/systemtest/common/ams/tool/BUILD.gn +++ b/test/systemtest/common/ams/tool/BUILD.gn @@ -13,11 +13,12 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("system_test_ability_util_config") { include_dirs = [ "//third_party/jsoncpp/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] cflags = [] @@ -28,26 +29,26 @@ config("system_test_ability_util_config") { ohos_shared_library("system_test_ability_util_lib") { sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ ":system_test_ability_util_config", - "//foundation/aafwk/standard/services/abilitymgr:abilityms_config", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_config", - "//foundation/aafwk/standard/services/appmgr:appmgr_config", + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${aafwk_path}/services/test/moduletest/module_test_dump_util:module_test_dump_util_config", + "${aafwk_path}/services/appmgr:appmgr_config", ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", + "${aafwk_path}/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn b/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn index 79d83eb93c9..d1e94f3e72b 100644 --- a/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FmsAcquireFormTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn b/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn index d9efb0a43bd..5f7aabed1b6 100644 --- a/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn +++ b/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FmsAcquireFormTestMax") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn b/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn index b4babf7706b..2b48241cfb8 100644 --- a/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FormDeleteFormTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn b/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn index 988fd66ee0a..5dd16b8f7e7 100644 --- a/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("fmsFuzzTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_performance_test/BUILD.gn b/test/systemtest/common/fms/fms_performance_test/BUILD.gn index 71870b36f79..d7fd68c9641 100644 --- a/test/systemtest/common/fms/fms_performance_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_performance_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FmsPerformanceTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_release_form_test/BUILD.gn b/test/systemtest/common/fms/fms_release_form_test/BUILD.gn index fef21bbdecd..28343569c4c 100644 --- a/test/systemtest/common/fms/fms_release_form_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_release_form_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FormReleaseFormTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn b/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn index 5af5ea7704c..bb457a36ccf 100644 --- a/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -49,8 +50,8 @@ ohos_systemtest("FmsSelfStartingTest") { "${aafwk_path}/services/abilitymgr:abilityms", "${aafwk_path}/services/formmgr:libfms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_stress_test/BUILD.gn b/test/systemtest/common/fms/fms_stress_test/BUILD.gn index 145f9e85d99..f8ddb2e783c 100644 --- a/test/systemtest/common/fms/fms_stress_test/BUILD.gn +++ b/test/systemtest/common/fms/fms_stress_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/formmanagerst" @@ -45,8 +46,8 @@ ohos_systemtest("FmsStressTest") { "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/task_dispatcher/BUILD.gn b/test/systemtest/common/task_dispatcher/BUILD.gn index a6579ddf139..4fd9d42f9f1 100644 --- a/test/systemtest/common/task_dispatcher/BUILD.gn +++ b/test/systemtest/common/task_dispatcher/BUILD.gn @@ -14,13 +14,14 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("//foundation/aafwk/standard/aafwk.gni") module_output_path = "appexecfwk_standard/task_dispatcher/" config("system_test_task_dispatcher_config") { include_dirs = [ - "//foundation/aafwk/standard/common/task_dispatcher/include/threading", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include/task", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "${aafwk_path}/common/task_dispatcher/include/threading", + "${aafwk_path}/frameworks/kits/appkit/native/app/include/task", + "${aafwk_path}/frameworks/kits/appkit/native/app/include", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "${aafwk_path}/interfaces/innerkits/want/include", "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr", @@ -40,17 +41,17 @@ ohos_systemtest("task_dispatcher_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", + "${appexecfwk_path}/test/systemtest/common/task_dispatcher/include", "//third_party/jsoncpp/include", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + "${appexecfwk_path}/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", ] sources = [ - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "src/task_dispatcher_test.cpp", "src/task_dispatcher_tools.cpp", ] @@ -59,11 +60,11 @@ ohos_systemtest("task_dispatcher_test") { "${aafwk_path}/services/abilitymgr:abilityms_config", "${aafwk_path}/services/appmgr:appmgr_config", - # "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_config", + # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":system_test_task_dispatcher_config", - "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/:system_test_ability_util_config", - "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_config", + "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] if (target_cpu == "arm") { @@ -75,8 +76,8 @@ ohos_systemtest("task_dispatcher_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${aafwk_path}/frameworks/kits/appkit:appkit_native", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index 20d2d4b950d..590604530d6 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -21,7 +21,7 @@ config("ability_command_config") { "${innerkits_path}/uri/include", "${services_path}/abilitymgr/include", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/jsoncpp/include", ] } -- Gitee