mirror of
https://gitee.com/openharmony/account_os_account
synced 2025-03-01 08:35:35 +00:00
aafwk->ability_runtime
Signed-off-by: zhoushicheng <zhoushicheng2@huawei.com> Change-Id: I04b3d6960f22519437780428af82784753c5f0cc
This commit is contained in:
parent
9c569bdff3
commit
2edf4777fd
@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
os_account_path = "//base/account/os_account"
|
||||
aafwk_path = "//foundation/ability/ability_runtime"
|
||||
ability_runtime_path = "//foundation/ability/ability_runtime"
|
||||
bundle_framework_path = "//foundation/bundlemanager/bundle_framework"
|
||||
common_path = "${os_account_path}/frameworks/common"
|
||||
services_path = "${os_account_path}/services"
|
||||
|
@ -60,10 +60,10 @@ config("accountmgr_config") {
|
||||
|
||||
config("ability_manager_config") {
|
||||
include_dirs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager/include",
|
||||
"${aafwk_path}/ability_base/interfaces/inner_api/want/include",
|
||||
"${aafwk_path}/services/abilitymgr/include",
|
||||
"${aafwk_path}/services/common/include",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
|
||||
"${ability_runtime_path}/ability_base/interfaces/inner_api/want/include",
|
||||
"${ability_runtime_path}/services/abilitymgr/include",
|
||||
"${ability_runtime_path}/services/common/include",
|
||||
]
|
||||
}
|
||||
|
||||
@ -78,8 +78,8 @@ config("accountmgr_public_config") {
|
||||
}
|
||||
|
||||
ability_manager_sources = [
|
||||
"${aafwk_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp",
|
||||
"${aafwk_path}/services/abilitymgr/src/stop_user_callback_stub.cpp",
|
||||
"${ability_runtime_path}/services/abilitymgr/src/ability_connect_callback_stub.cpp",
|
||||
"${ability_runtime_path}/services/abilitymgr/src/stop_user_callback_stub.cpp",
|
||||
"src/ability_manager_adapter/ability_manager_adapter.cpp",
|
||||
]
|
||||
|
||||
|
@ -44,15 +44,15 @@ config("accountmgr_service_test_config") {
|
||||
|
||||
config("ability_manager_config") {
|
||||
include_dirs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager/include",
|
||||
"${aafwk_path}/ability_base/interfaces/inner_api/want/include",
|
||||
"${aafwk_path}/services/abilitymgr/include",
|
||||
"${aafwk_path}/services/common/include",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
|
||||
"${ability_runtime_path}/ability_base/interfaces/inner_api/want/include",
|
||||
"${ability_runtime_path}/services/abilitymgr/include",
|
||||
"${ability_runtime_path}/services/common/include",
|
||||
]
|
||||
}
|
||||
|
||||
ability_manager_sources = [
|
||||
"${aafwk_path}/services/abilitymgr/src/stop_user_callback_stub.cpp",
|
||||
"${ability_runtime_path}/services/abilitymgr/src/stop_user_callback_stub.cpp",
|
||||
"${services_path}/accountmgr/src/ability_manager_adapter/ability_manager_adapter.cpp",
|
||||
]
|
||||
|
||||
|
@ -16,7 +16,7 @@ import("//build/ohos.gni")
|
||||
|
||||
config("tools_acm_config") {
|
||||
include_dirs = [
|
||||
"${aafwk_path}/services/common/include",
|
||||
"${ability_runtime_path}/services/common/include",
|
||||
"include",
|
||||
]
|
||||
|
||||
@ -28,13 +28,13 @@ config("tools_acm_config") {
|
||||
|
||||
ohos_source_set("tools_acm_source_set") {
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"src/account_command.cpp",
|
||||
"src/main.cpp",
|
||||
]
|
||||
|
||||
public_configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
":tools_acm_config",
|
||||
]
|
||||
|
||||
|
@ -20,20 +20,20 @@ ohos_moduletest("account_command_create_module_test") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
include_dirs = [
|
||||
"${aafwk_path}/tools/aa/include",
|
||||
"${aafwk_path}/tools/test/systemtest/aa",
|
||||
"${ability_runtime_path}/tools/aa/include",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${aafwk_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_create_module_test.cpp",
|
||||
"account_command_util.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -61,20 +61,20 @@ ohos_moduletest("account_command_delete_module_test") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
include_dirs = [
|
||||
"${aafwk_path}/tools/aa/include",
|
||||
"${aafwk_path}/tools/test/systemtest/aa",
|
||||
"${ability_runtime_path}/tools/aa/include",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${aafwk_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_delete_module_test.cpp",
|
||||
"account_command_util.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -102,20 +102,20 @@ ohos_moduletest("account_command_dump_module_test") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
include_dirs = [
|
||||
"${aafwk_path}/tools/aa/include",
|
||||
"${aafwk_path}/tools/test/systemtest/aa",
|
||||
"${ability_runtime_path}/tools/aa/include",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${aafwk_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_dump_module_test.cpp",
|
||||
"account_command_util.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -143,20 +143,20 @@ ohos_moduletest("account_command_set_module_test") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
include_dirs = [
|
||||
"${aafwk_path}/tools/aa/include",
|
||||
"${aafwk_path}/tools/test/systemtest/aa",
|
||||
"${ability_runtime_path}/tools/aa/include",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${aafwk_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_set_module_test.cpp",
|
||||
"account_command_util.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -184,20 +184,20 @@ ohos_moduletest("account_command_switch_module_test") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
include_dirs = [
|
||||
"${aafwk_path}/tools/aa/include",
|
||||
"${aafwk_path}/tools/test/systemtest/aa",
|
||||
"${ability_runtime_path}/tools/aa/include",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa",
|
||||
]
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${aafwk_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/test/systemtest/aa/tool_system_test.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_switch_module_test.cpp",
|
||||
"account_command_util.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${ability_runtime_path}/interfaces/inner_api/ability_manager:ability_manager_public_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
|
@ -22,13 +22,13 @@ ohos_unittest("account_command_create_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_create_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -56,13 +56,13 @@ ohos_unittest("account_command_delete_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_delete_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -90,13 +90,13 @@ ohos_unittest("account_command_dump_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_dump_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -124,13 +124,13 @@ ohos_unittest("account_command_set_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_set_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -158,13 +158,13 @@ ohos_unittest("account_command_switch_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_switch_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
@ -192,13 +192,13 @@ ohos_unittest("account_command_test") {
|
||||
include_dirs = []
|
||||
|
||||
sources = [
|
||||
"${aafwk_path}/tools/aa/src/shell_command.cpp",
|
||||
"${ability_runtime_path}/tools/aa/src/shell_command.cpp",
|
||||
"${tools_path}/acm/src/account_command.cpp",
|
||||
"account_command_test.cpp",
|
||||
]
|
||||
|
||||
configs = [
|
||||
"${aafwk_path}/tools/aa:ability_command_config",
|
||||
"${ability_runtime_path}/tools/aa:ability_command_config",
|
||||
"${tools_path}/acm:tools_acm_config",
|
||||
]
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user