diff --git a/aafwk.gni b/aafwk.gni index 258345a93c98a571ade87575b0f529c43c618569..1d2322df3051bc3c3ed44c577c35976e6cfc0d3c 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 c27637c77d84dffefc26cb7100a4777373ca8ab1..fb21cfde670039b389986ced5770a6ffabda5f08 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 70564e8ab762fcd610d537279f0c2e5750aacd53..56c8df40e58aa02108811ed3f8a73e98e611c45b 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 46ae2de1f2106ee9a679f9dfd0a7889b5fb90891..4eba3e6c3255b5e618f6b4323fc767ba65a25262 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 c9db76b38d8d1fbfc1d16d409dacd3b3308ca75d..0c9cd44d8fe6eabae7358a0d25036e8599194c31 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 b9cd5c7d9657b75689a703f7d24da153983b4f5a..87579e6a1cb2be9288ad2d5fecff05add81159aa 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 7b8d0719dbcfe7ff6c2e6ddf04257add7fe7d296..4522943f6a3f4da79c646f2363dcd8fffe725328 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 69b665ece03949303222a190f8cf6742574d3423..22890f97a94b27981f11605d30e6e90ead7e7722 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 831a5a6b4d3ea5e26f326f8f795d99cd61238d0e..a989142c0d233a6ae71affba01d42c7257a089c9 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 3d667f4b7b57a5ff7def45d1339c3d24f774b4b7..e106cec3f5a9938cd3fd7bbd0c0ee821823ed1b3 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 e8aaa363e7f575e6345d052cfed429f22592f814..b3fc9eeb716626abb349b074e015df3e75e9e7fb 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 519177153e6ff15d3de95dd4dfb1aea7e83d8c16..e9ca1701d06f0a7225d8242d4af53f3a4e593915 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 3d4b6c50adf912aa8c28c8fb989b2337c05ea4de..6a7c3b0ff49d12b549248c0639e7f6902673989d 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 b6e09b3989a532901e7ffbdd56d759240a5b3962..110a96851efcdf1ebaf54d99f0e0e8b60b12bf71 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 bfbcd9653a24f973f1ba3a44c587095ea09d17c5..dbf140a6dcc699b01560c825aed38cf97d52af4f 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 6c89a45c19ae2e2c85668e833384f8d2a439c42a..2220a960c1b278d8519172106e53f312e520ea2c 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 ff2c39ffde91f0bc922ea06377b7526b81322da1..07e2a4e043c4da112e65ee888b4500421f0b404a 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 a8cad99499acc6654cae028c2744e92c85040a6d..91209f9aaf91341838acc9c66f849570725287c0 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 d8dc900752f3af35ac653900f42cb5fa50ed73a8..9064efcfb9f8d5f2c70a2d88f5e878920e578ad0 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 8d0ae035d4d8762be2d4a2e25a0851fac9e9ddad..38fd0b8cb50de6bd0aa58e2336d781c003d1f2d1 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 5253fc00ef0f87174666d5c504eb5448a659cd5a..6c5332a33fc20642958f7ac266307a3e193953f2 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 b53f469602a9cd95006c97728c8eddb048682cb3..3f12f63bbbba946de848685f43bebc9bb4b921e8 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 50ca70b94e2757ed9f783874f10064204fc19f26..05c03014b4a2de251c99d30cbc49b0d9b8988d79 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 ea8701cde9f486bc9c8bf29720b8d9b91dd59cda..9a4aa9329e3524f45d4441fd0d2248c2d4fc7077 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 c4406603158dad9dab7b4c855e1a65c81f3119e6..48eea95afa3514c1115d7bfc30ae8b13d1fc1914 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 84bb315b4b821e451bd270a0cc44a81a52f8f933..84ef965d84b84d4b115c2168947c4079e5d9d435 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 870419171a43f54d4a8ce54c70176b9da4bca240..18205e3a13e757bd4c879f8532bc5df1bd9c6f93 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 2c074f41bf42499b625365bb81c809a6e8f5dd1b..59a2a9d359c1be10db64cffbc6932a94ae3fe2df 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 1351003c1241b5bbfdf7a8cca5b4f7edfb8d415f..0e2c76430713edddbc3922b906a501078ca628f3 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 08fd61665b1c66c8222ccbdfb0f4e3906d0ce8e2..2a6ac8807c4c0c33530c5c6cd851563d74c83163 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 84dc4f56432fff0b6d112b48c1f369a0dc58cb4f..3e4b178b487c5f5ad87cfed9e1f39f1a9e27afa5 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 31b18e0b2051ba0248fe50b67a2044c2fe6279ca..d28885c93f5186e19fece5ade76dd7a6736cdd95 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 aee8bae1ee1a438583921c71a7f7e4dd83c8e55f..553e1954b97048447201f8feb5c43c97fe184e57 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 fecb405b94e30eb29d34a856ef8a91ace1d0fec0..09b12dd179653d7958b4f4cd88d2ac3745ae7249 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 b9a61e4dd962c081b1febe6d64aa1d3c6f453eb0..2fdaffecc96786a6afbcffb84fb883fc83749fa3 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 61edec157e0b835fbe56bd4c587544708369385b..e59fbaa20d97637c2428b4a00c629e1abe06a58a 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 830657f22d7c2dd10ddd89e8c66a53a821d3e49a..4bd5a75e8f431c289f7b2c0d4a9aa93ed8aea2e5 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 aa3a7726b9f1003c047b865a78b6749d8645608a..0c078999d7e9ade7e4f675708dc00e0e052b12e2 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 b0b9e4a73bfb98b64420f75d06801614386edef7..613c6c31fc13118a73098d64d7c1d280d9e67f7e 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 ec44583964970a4e0642a6b3d109702f7483121d..56139637df9fed381df4b66eafac4df75aaf29ea 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 51efe8a531afa17bf372d5a5b9fb7eae3e3c0ecd..6337acfd2edfcb0f08fb95c195b7d379524f2943 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 c0b20cdd1b68accc175cb145474e07b37a872c2c..0ff3fea7d6ea44bef52e1c8bb9287abc43c85b1d 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 c3f37a94f8f1fd3232c042a2b8f7bda655be0d9b..345e061044a02a335b7c5608d1f7e3f6da5b7280 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 25904785b4012f7a80e7609113d505f4c661cf4b..dd030e7fd3e20ba18096c7445135092c7fcdba7b 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 4527747a0923aa82f7ceab9b7336e87c8839b0e6..f051d011ba2fcb2768768fb75a93158bcca75cdf 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 90edb021d1aa42eb2a7f63d0adbd1c60679b681d..7d5e788238856ae2571a1e8672795abb7cee95a1 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 3bf6449c2e36e71d3ca42c0596fb6ae546e7dd1f..05ed6f3d41bf55e0947a77bf42554880efb0c8b1 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 8c482d08c2918c41dbf946e3a8b6b1207859b1f7..3ba76c61c9750b27ac0c8b854e273bd758400fb4 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 c1c1ea4f7781e617c47964f1baa21905a2a22ade..a1aa07bada5b0bb2f4c7f17f1dd88cc066d1ec66 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 ec80f8caf8fc712317564d1eeb8973f653b162eb..59b0ede672c5373ec3aa762e82d8d48c8a544dbf 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 5688edb4c10a4cf1e76af0fd6707b3c3fd23a7b1..0c99df9cd42f2c7f66cdb60b66be087f0dd23465 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 8cddd53d0febbce5a5925d71e0ab9b28824c36d8..6ba065d703f698e0cbc946c3c9f57fc3cf569e84 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 d3bd48bc6afe4ef66acd030f425939238dfe82d7..154f6aa3066b076de10f2f2c1967499e184ce8f2 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 42af18f0b35b5ca68a7264aeb02617e66ad20a76..0c009fb76b9d1c1b6730dc3a6cc79dc1e8ae09aa 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 cee585653eec4d9c22ffdf82dc32ecda148e6971..68d073d3ee97a76cd771d34ee2256f18997402c2 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 9b318c74d1261158e947255120be83b5cd4a9c73..62993cb3e1109751de01ebb9f7cbd46eeb47b927 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 d4ded8f871b05190b63678b0e24c139ed4c47ef3..04aa933e0470bc3c0a99f4bd772cef921d48f0d5 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 68e147d4ba343906a5c40f930bcacebe0d1efafe..dc6d8e7f1ea51856e43c3a132bfd5f19f131267c 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 845cab6449a6bc2f3fb7b915f405382da28a7060..2e0926f60a34d38cb39134716dec55fc3d4a0c9c 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 ad9baf2dc04471749bb895ebd6f891e766d0d6f3..ba106baa796df7ad0dbddde26bc2acd2cd249387 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 c9ef49599244d99233f2a1d87b34107e790cad19..0a67e37cdf7efcb288af347cca2ef9a1ab039fcb 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 99f57765caffa1af14ec62508eb7c2b223e46011..024f7c0917723252a855555bf68511430e363204 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 a656cdf62aa5de540420c340a1980d6fdb131593..1b72ec1c662d93fbe5d81a3a4f85dce8eefc5388 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 7bf5a159320f211611a9c8709baf82b46c896502..ad7bd2d7d4707aca025caafea04982b9b875a78c 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 64e2a517de35880d5218f3c8e0780f6156b7c732..ac0c96a520597602d7cac35c90b7c22abf842d3a 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 f04aafc6ef286887a21861c49ec434c6df00cdb9..eac94153b61e93f2139674fc32ea9d8b2b5f93ba 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 737d7f835af6646a6de690bd31ce84e618c1acfd..79eaaf590a356655f140e5fbe8701e8ce9a33c2e 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 594e2886c7ae0604d101a46b02cafa49d4710858..809ed0232e908a8a1cc10d413f4fdc9ebce0e568 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 d8128308a2566abc5707f8406f05b7e027697510..64b6781f6e6b760de7a817d57e7bd20fc32b5d5b 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 609f9d5b5f705702211e5cf4b0966f9335a1322c..62a437ad276e1b8b2504e33d82c47b0a0e93cc53 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 8c276bc33b63477af8812f21aef54d26fa62e99d..9488f2e8d2ab9bd5c96f1a53fe2758ddfa823131 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 d0648755fa2706b9ddb18f41bfd746d964a2e69d..9082856064295f3374909ef205c940adf5d1dc3f 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 299a21a269761d4fb09c620876f856beb984b238..a72f659e60a1455a794669a24bb575b77bc9cbee 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 c8f417ef4e0441dd8c25228de29b60bd3b9e560a..95b4ccca898cc451737a92ad14cf1fc8a0b2aa2c 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 65f92253460a1c75c5f7c1882222e276e9e39540..9609373a2159845cfcca269c06bffa13a5dde449 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 59922b31f53f2e5dbbe4a610d4d953eedfcf609e..a60edfcc2358b82b98e8c1a678ebe8b05ffc7640 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 d30cc34225427c421ee9e849752e3883d0da785e..50fb447099efbee68d9a917587131de7b96d3932 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 f363a0b6e89a08266251a833485342152c81ff9f..f0a5c708e9a2f5863ffc2d4f490cf2e89803fba6 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 2de1537ec27e3bdbffc99a317a73738527b7b456..fc6a70b6ec68f015af973cecab1bfa51c0a5aeda 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 e2c26bfd2b00c35fbb410fee3c84a8dbbecbf4c4..c39087fd4fd630f1be23b0958f6f9aa6b4d8060a 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 7aead3646dff842b84f026e831131c349b6165f7..9b76d1cda8773a2520248ad9eadb7c21efeeca35 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 0bf8dbdf133225a0a762e0278327d5bc6eb79345..aa3a7add91e874c66429703a6ba1194847f7289b 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 475f9a4d391a2bf4fe20c75d9d16bb780177ce37..95025bf5fbcc71bf773f4859558f0aeb2a616b53 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 26c805760c958f8352ae10a3ef45b55b18640156..d59160b95a7cf7e3b1644d5cff5fcd207ed65fde 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 82bfe2a310a525330157904b0ed203c6068e6c5d..022070d3f6c6dd44d445a99dece66531cb08820f 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 5034c1ffce5f6d1d570ee471e07841cc629f5616..106e5bc131f94005ef210aeb59c043425305c608 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 421ae2a9292179161ad1dd5b5898a6662632856e..78e170da0bf45691aa8839fc980d52ea3a539990 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 2f909879f9faa4f498d32b18f0250365bc8fd853..08190992d06d9a6435e43b9b6a832f33a4871ee9 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 557e840285570fca2ffb403338b2a0508242c3e0..4ba0902bcd575edb53db180627b052b16ba6f55e 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 69b5f3881e8aca75ea0c5a879a2fef37a2415aef..1c40108977b538ab1811e63d1267bc463b1f9412 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 4be3905584736ce14f4f0acc295019360935aa97..5664ca186323e405fc8d795f1d60a0348db4ba8c 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 c600e1383c828f4730513ec958b7472aab3170e6..10d7b65b9456574b320d4dc16521a34000688348 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 04d851870ef6c8c648e488b5fb5e385ef70d5b42..1d337dfd81f005d12a5e25201420cdc2d74ac7c7 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 7be3325f0c2612586e1cedc950943621256f4ce0..5620f6ba298d5514298e553bbb62f9a00b185ea3 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 a21d60ed8e6a70a0429715daa07796c7c4e1881d..bc46f41df3409fd38afd22e8d75c16c1ad6f96a2 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 46cdf6ed86834c5135215a19113378a2bd81860d..2c87cc0565e5a3a1eca657c87e0c62ae81c35357 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 0fb84ce4175570d538138c2439d268c98c10b995..26d55e8f321814797861e2b55529d586a65a464c 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 cdf1bfd3f8863c859e204b4953ceabe5b69ed855..6da1a69285fa1b0ffeb84328a576a007daa38be2 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 9a91509038239b80ed60ba9a682e338e3b46b826..e1c89114b103ccbd57e9a38f7e3c786a83c87851 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 e52227d863e341e55fc649a147c459c6befebbdb..c4724786a4494566b8fdc5b517c7c8073495e978 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 1a3f71ce77a1e7ae63a3d01a6ae034e3038d2991..7fb324898c642e9bea225e3e12d7f82030d38b7d 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 0f9c7ffa311465f4530e5d40542ad15abf4e3feb..3b370249abb63382918047009cbc790fa8fae718 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 d1ae7578fbcd6339bd0acb0b0f0819ccf120914c..360d030c410c145c0bc77eef231bd9387de5031a 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 911468816cf8850ff13a2beaedb1f6668b04e36b..ac1b8e7a0bbc7c0512d4d5554ac2ba133e41f6d7 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 5fba3984be97123fe948b3d1d18550764af34a7f..e9eff3902ace922a8a15321526898ffcf34c4ec9 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 2ca58a5ca02b5078f902bcd8ed68c0932d11c7c5..ff55e781378a83250d7c478a5154a8388707b73c 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 aabd4eb141946918c720f99f9b85542a9044aebc..80f760d6dfcb3f589f5905f3e6b25938bd28c055 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 045c0a79a0744bef66a06fb0347ed27daba0cf60..37eafbd93e088a70d686dc348064e64409ca16af 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 d976d90afadbd7fae3679b60537559304021ad3a..6ffacd722f18a68069642d4b723d335f1d0cb79d 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 c6845154a8739658521a6c421370c8ab40923b3a..3d01abea6f5fcfaa0a83f190b456add615a6424e 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 267bfff9484d4d321f5baffdc2c118604f6e17f1..68e882cca16ce22c0fd5b9c0bebf6796748c8038 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 ed747cec7929e5a9978bb924825761344388d8cd..bcf988e55db7358ad1b08c36f86ec5202d2beaa8 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 96e9e24e5051b55f8a40f14d95053c659048224e..cfebc29b374ac7cebb79a25162e8cde9d48cbf6a 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 79fe30c8258b774b81126f5591c4d8fe67dd9705..327dddf79493517e6d2bec12a117429dd3c1133b 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 e1397cc71ef0cc6f4630e843fe40dd02b3207235..46aa0430113ba5614ea5e89fd96012bd6dc8be2e 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 39ef82d731d26a3301a1e6a244ca070f2911060b..ab6e4feafb6b7d6783dc0951a09da7cab886a294 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 92acf46e0a1724ff41bb5f9a8175e952b6ff9c3b..891dc0894bc7e968b2ec7089878d257eb4acbaab 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 03ee4fc7f444cc565ce2c40370a66e2b7652ebbf..f67ec4e8229883f7451cd29f75f0850a04e884ab 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 2b417108397f42e0751e51ad464b027d08a8d41e..927dcd2395fd460d0fa075ebb7ad5525184b677c 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 88e24066bffa448224a8a6a3e261c8829e4e4293..358df119ea88768c403e86a24f99dc02a984ed36 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 868eaa1e9c8af8a0ea7cac3c18a39d2df20c0ca6..346641df158e408f7d077e4b5e070c04bb14d0cf 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 516a2d14af5cd5fb815df731f506b290515e0fcd..bfec097cae337eb88661541188c1e6f357e3522d 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 3dc2905cd8057e0f77a50b276c276648038a3249..d4c9ea9b5d66480a8a6a47d0fb22b661436b4ee4 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 27879bbe0af44a0ef134b7f815ea5d7225f4c12b..63ee40f37af381a2f38fbdfad5dfd4386bf3661a 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 829ed019b472d58a7e4c9bf44b6e43146bd05258..cc565acaeabfe835ca89e666179462eaab94999e 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 e5a75f35ac61220125093ed33727bddcdf7606b5..ab53434f03542d8e0a90383878c29977bfe752a3 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 af9f3ed2caed346fb0cbe8b8aa00eef54c612f99..12f2d8d4224dd9d84e760b3a93fae24fe845caca 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 e566c5e1d1f66cf09ad1b3ed7f6f8b1a29202df6..0802e22d51f3dd263edd45e94d8e5df6feb86837 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 b5da03e48e8a18e5e63f873b0dbf26ecf2b124e8..d00927ae013dcf6af1dd274917192425a0cd1aec 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 033b641e0763e3e316407529f89f4a75ca9e13a3..6a2d11095edd67a23dfeb22a8db5610deb3b0f4a 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 84091db71b113bf286ce25da1b55cad99df4be17..41b0e906713302ad94587c73436b9402da02a3b0 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 01499db7ba3ab0f22c3c5577bfb48fa4ddf934e3..a342e80ea4bce42fd09d0e2abce1690b0aca2685 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 2a055106932f42d971d54a36e4da518bd2a307f2..770ac9bee8ee86b1df9d94ff3d99c6aa9ba842df 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 4bd884a05672ea6e70bfc0e44c71e5c0808b5974..8fe514165b2051cb640ea6d8cf974d26e63fbd0d 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 a6f3f70e47955bdf3b7a020184207093428ae24c..9e477b7569f7cf910923bc601704816910f3dce9 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 ee1a898f0624dec81baf1c8543a24e69ef836f32..8c740f9c96c261a8d485dba05a36c53ad080ba28 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 0ae27f28aeea8584c37159a1c373b732035315cc..85bc129058d4fcaa06211a27adb93a14912cd1ad 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 7dcd03b640490f070a37759a54fb2309ede22e18..bae997cad5ae47e74f8c68c19172f829c3894633 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 57d97d436b082d04fef51e20aa4ca107076b49d1..0fdd39a438fbda3fa18d2e0c8aabb0856e50f374 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 78bed53bb5958b169837383ad744afb246422989..efd0dce12c2e7f81effc56b28d9457f74f13a26a 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 f3bb9878c4d28932c7191902617cb8a150e64f93..55c640959bb992a0132d567d8be0885d7349059b 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 4cb52e12f7e3200e0e0c51fb336765ccca445ee3..42da056bf993ace9d926abbf23c7b3864d927b74 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 2c8865d926f1abb52669a62f72163ef3a2f47b34..f6e117f9ce389f36c2dde374403af8661675287c 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 d7371efeedc7e02c88c51d3c37f8cb9a5de66390..07ecbfc52298d7cba4cc8f4f3d071127b017a015 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 cfd5be5a653dd939196f48696c609d9c1ff254d1..96c8cc4900ba5e1ec6998e63c3e66ed0a2e0bbd9 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 fa3ff031c738d12d79a6bc63871075ced0626293..0ccdf812a7f3df1af106608c100cb26c28c5702b 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 5716ca5e795740d41de539156bce20547dec68b9..32b8d14493a04af26c1a7809f1cb94c159f8971e 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 e7dd63d5da691ecc431364df6c137346be87dc19..c3735b7a23a7484116084c9ff5f6c3bb31f50705 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 0770df4757b375ea5d719f824dda3e4ac081862e..75ec576f4ddd53b827341a101e77a70be092b015 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 cae6dbc2d4a705afd1412e3893feacae6f2cd885..80beb4fa03b52f56cc3b0930505be4cb5729bcfa 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 a375339425db67b180afacfa2364d395eb183e52..9206ee0695e815306d7634596f9706e6e9fbc947 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 d56ccf6f7ad4ca79b3e9ab1ec8fa2950250bb2c1..f10ed1ea4d0b7548a4d76f71f43e873fe3a51fb1 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 121b77c08eb27652266bb340c69f350d8dccc815..afd27aae434a57b74d6f667daa7000f352fcb6e6 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 3d2e268ffcca99a6cfd5df9318bb7fca577d09d1..46baadb0933c84dcf1e52b4b0ac0c6d99fc60faf 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 bca9a7c5f76ab8a1607c0bb567f4adbc3c528fc4..450231ac2489e1a24b517e8f677c75def691c1ba 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 546df0f16995f86f8e0f02dfb724fa594eda9e64..c9f1102cb341a1cc862c2371ffd5f4c13ff3a4b0 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 b36c8da0f6658dbe9a2c260c20a776570fa44e7e..c76cfdb3e705c6aaa4aa8dcee2ffe7de3850bbf4 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 0c22a3b711b441a629fffb887df4b0b7029e54ab..7f6133a6a675ccc3ed58fce4625f8b16d32c3117 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 4e31381570e7811a3bb46af7b7631b7e52cd25fd..5fa738365461f71de92900cd8ba954d3a5a4c2c1 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 9a47f73d27e2a660f2b2d5196d817d720d760891..b6e2e17c55b7e73db7bfccf51f6e47a8848b3d13 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 70a33d2ea42593720009552a2010a2c62148968f..9910ce1dea6f59a0b80d53b03f437093e3adb7c7 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 2360c8a4d57e2743a0f7a7ed8cba10b1a9d4bf63..3cea2d2dca23da9c1a814829ea799d8c57461a9d 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 6929a4cc76d30c5550be4239ea02b0d6fa2b8d88..679cb918a2786d3fc957b106d69ac3da1de076cb 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 19084e6ead1ac3542ecdb7285a5a5eb462f937ec..cbf8c769a01e28652e9e015974104a14b07241e1 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 7063ad122f498f75429ec5dcb5268c8bf0f8339a..b67d7b0466714b0f939ff7c6ffaeea591018ff86 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 26d3dd95013e6a81bd1c21b33229fa2e86f6dde8..455ec0429c854951a3de3ce9967d858088b676d1 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 657255aad377d8803fef8e778811e3f5619c1558..d39b410d946b6b7836ffe65eb8ebc4f080c8aade 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 8571add5f07bffc5801cb5811a506363c75d5089..ed0b7b7e24f931ec8c9e89b06654207de01281a5 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 fe271849fb0304f4cc8222f8e86607a7388aef22..dd7c2851a7f06caa9636254ebdebfa160d74d839 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 ab19ed7876bbde5e63980d28b173336442dc29bd..71e3af5cf5c443c45ff92c4b9cab6b7ff6adc113 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 c967c50c88190cb0b0f30d6a1283a97a474e267e..82aab495e5289a626e291780731a14999dde2251 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 b3abe3e871a445be5dff41d38c73332d37c51f5f..3736bb33685220a10fd50aac3bef43ec18030769 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 45fc7d3ac2bf5bb8497977d3dd762dc43df4a844..90e8f8ab6cc39c240d3a6d5ad10045460368438c 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 b910da0f53873c648e0092589809dc77ebd268a4..2fe551ac9a7009bc681b8145a9edf4a3cd448411 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 faba4c317db11855b5de28a9ab360a8c2698f900..db23d5fa9a0e17872d08ebf36ec9a0f12aedda0a 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 b32615d6c1b48d5d9959d966bb07cdf2ba387797..ab42f124587a7ce9f318a557025a7ac1b70dea1c 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 74f2dc0e0d328aee7c3c9042c0d8fc6a4251b4f7..0c272c55d7d2882d39461adce25d387a54a8690a 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 5e66942fd4d95fe8c66c284be587ef2fdde31f84..b04b9412818f85e528df4029a0c77dc20ea6a942 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 2cfb91487383dbcd5d5e399d3344a8e9f829a047..b2ade9f4a4616614fcc3d96e714f7b508a8cb70e 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 0f47fbd96000d11d2733fe385a730e4eabca48d9..1d42ec0065bf558cf607d902b08b6dc7fb927da3 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 fc18b6eb065bd58a33e04f242e2c084c7f093d4c..aa0f06c34cda74d7a779a6cf0908fd37ae43b64b 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 d2408ef7005afab60db7cbc2799a76ee0b017ee0..9ef25770ce6a9d5112a8b9cb927a043ba35d39d1 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 02997f8175444eef89e0797c731e66209bd33766..30c46cd809d4bfddb37e8d07922e30d4de620c10 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 3b1e9a150ec1e5f78195c4b93699531056357cd8..fa4fc46dc51b3b61f67a1ddea297d6c162639cbb 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 b9d11fb1f72e354760b4a944f6a73cda37042f4d..29e5accda78ab1879ee49eeba2b55e4358e9c5fe 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 88d87e2cfa359860c51d39b0f5a006698df862cd..cf825cb29c12a92de1b81e0651db394b1e8b15c8 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 894deeda5317c6a1802ec2e11fe787e8e90afdab..bd0c603a3b05f49b34de2b029d87048a5bccbddc 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 31b8600f62d7eaa9d071f7c2f95bdcaa7978ca59..59365a9847682a1acad1d5f7b29ef161df8796e1 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 4b58dea8323028a19ca269b66c240bf08be51b82..01575176cf69e995f4e4d75cb0457c0960d216dd 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 edb83421c35441ca660abce9e454ecf059267fbe..b3f659be66cf2320c2ce6337a5ecdc8da6e014b7 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 9b28a1017b1b9feb71e84972b01a957bceec896d..d107758ef8d26a02fefac0168f5c244f865b1a40 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 30d060c6fd412c7ddd4397d7c769ded5c866e3c5..af5dab73950e0b2dcb0c8280c9c80cdf094fef6f 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 9db8e7a1872c9d28219cf0b75067cdf9b6c4eba8..a1b716dc0f2704586c391ef8b53be42930e06312 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 e656d9fa12a88d0779473413fef143f3c4a53b52..4f6cb867e69ea398d1f905da1ac9ac2ce732ab98 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 a11db7f64ed507ebcbbb177aac2fcb3ffa94f81c..b1dac1da7982b69ff18513b88bbcfeb6d9358c22 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 c45050efe7102ddadad56f21158de93a04ef111e..a5c1992c0c169cb3c3037ce7407038c637e07c1a 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 d76f91e6278bcc8710627cd277f8c57060ccc126..72b9a06e0722ae6dbabbeac8f60b2fc6a1b630d7 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 0fb9955a93d3ca6cce44a847f13851dda69de471..e7a2af6a8f12643dd28fdc1ab70ec9d62409fcf5 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 79d83eb93c97bc556fd654e5638c7258cc420ad7..d1e94f3e72b346a9071320381717b7f386b0db0c 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 d9efb0a43bdfb2ab6023778baaa6e9b82645155f..5f7aabed1b6679ede40a5eb0f31e1a13d7bd30c4 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 b4babf7706ba7111f1cce9b32ef68aa6949f0be8..2b48241cfb88ff27982facba0fac18c5c26e07fc 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 988fd66ee0a523481cb59c09a67e63bad55af52f..5dd16b8f7e7db8342883904303660ea2521941f5 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 71870b36f79e10767c9790570608bdc62eda6ce3..d7fd68c9641b22f18832e1f80c24e500fc5ca134 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 fef21bbdecd13858d00081ebf05b426073452263..28343569c4cf208087bc9f9f9ec0377f280bf9a1 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 5af5ea7704c90f6a3a645daecd96a720ad01e780..bb457a36ccf4bae4748bd3b5ad9f992524f90599 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 145f9e85d9904e5e64969cafa403825fa6a87b96..f8ddb2e783c77bd6a870136ff0e71e84f363d587 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 a6579ddf139d490d93fb806c15bf161db1d8459f..4fd9d42f9f132a307285ad1656b266fe8ffa9a17 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 20d2d4b950d424be816bdab32cfc198667f5a460..590604530d6b8f0289da79d86dc238b61c3a6990 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", ] }