diff --git a/ability_lite.gni b/ability_lite.gni index 34055ed..c075e69 100644 --- a/ability_lite.gni +++ b/ability_lite.gni @@ -19,7 +19,7 @@ ability_lite_path = "//foundation/ability/ability_lite" graphic_path = "//foundation/graphic" arkui_path = "//foundation/arkui" ace_engine_lite_path = "${arkui_path}/ace_engine_lite" -samgr_lite_path = "//foundation/systemabilitymgr/samgr_lite" +ability_lite_samgr_lite_path = "//foundation/systemabilitymgr/samgr_lite" kv_store_path = "//foundation/distributeddatamgr/kv_store" communication_path = "//foundation/communication" dmsfwk_lite_path = "//foundation/ability/dmsfwk_lite" diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index ffb6e04..e8caea0 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -58,8 +58,8 @@ lite_library("ability") { "${aafwk_lite_path}/interfaces/kits/ability_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${utils_lite_path}/memory/include", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", ] } else { target_type = "shared_library" @@ -112,8 +112,8 @@ lite_library("ability") { "${kv_store_path}/interfaces/inner_api/kv_store/include", "${graphic_path}/surface/interfaces/kits", "${graphic_path}/ui/frameworks", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "./include", "./", diff --git a/frameworks/abilitymgr_lite/BUILD.gn b/frameworks/abilitymgr_lite/BUILD.gn index a3be87c..97cce51 100644 --- a/frameworks/abilitymgr_lite/BUILD.gn +++ b/frameworks/abilitymgr_lite/BUILD.gn @@ -38,8 +38,8 @@ lite_library("abilitymanager") { "${appexecfwk_lite_path}/utils/bundle_lite", "${utils_lite_path}/include", "${utils_lite_path}/memory/include", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "./include/slite", ] @@ -77,8 +77,8 @@ lite_library("abilitymanager") { "${utils_lite_path}/memory/include", "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", "${kv_store_path}/interfaces/inner_api/kv_store/include", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "./include", "./", diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index 593a2ce..f9e8602 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -60,9 +60,9 @@ lite_library("abilityms") { } deps = [ + "${ability_lite_samgr_lite_path}/samgr:samgr", "${ace_engine_lite_path}/frameworks:ace_lite", "${hilog_lite_path}/frameworks/featured:hilog_static", - "${samgr_lite_path}/samgr:samgr", ] include_dirs = [ @@ -77,8 +77,8 @@ lite_library("abilityms") { "${utils_lite_path}/include", "${utils_lite_path}/memory/include", "${dmsfwk_lite_path}/interfaces/innerkits", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "./include/slite", "./include/util", @@ -125,10 +125,10 @@ lite_library("abilityms") { ] deps = [ + "${ability_lite_samgr_lite_path}/samgr:samgr", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${communication_path}/ipc/interfaces/innerkits/c/ipc:ipc_single", "${hilog_lite_path}/frameworks/featured:hilog_shared", - "${samgr_lite_path}/samgr:samgr", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] @@ -162,8 +162,8 @@ lite_library("abilityms") { "${dmsfwk_lite_path}/interfaces/innerkits", "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", "${graphic_path}/wms/interfaces/innerkits", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "//third_party/cJSON", "include", diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index 22e4332..25f1eda 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -43,11 +43,11 @@ executable("aa") { deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:aafwk_abilityManager_lite", + "${ability_lite_samgr_lite_path}/samgr:samgr", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${communication_path}/ipc/interfaces/innerkits/c/ipc:ipc_single", "${hilog_lite_path}/frameworks/featured:hilog_shared", "${kv_store_path}/interfaces/inner_api/kv_store:kv_store", - "${samgr_lite_path}/samgr:samgr", "//build/lite/config/component/cJSON:cjson_shared", ] @@ -69,8 +69,8 @@ executable("aa") { "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${utils_lite_path}/include", "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", - "${samgr_lite_path}/interfaces/kits/registry", - "${samgr_lite_path}/interfaces/kits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/kits/registry", + "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "//third_party/cJSON", ] diff --git a/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/BUILD.gn b/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/BUILD.gn index b6cb865..4d09654 100644 --- a/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/BUILD.gn +++ b/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/BUILD.gn @@ -39,17 +39,17 @@ unittest("ability_test_pageAbilityTest_lv0") { "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/kits/appkit_lite/appkit_utils/include", "${utils_lite_path}/include", - "${samgr_lite_path}/interfaces/innerkits/registry", - "${samgr_lite_path}/interfaces/interfaces/innerkits/samgr", + "${ability_lite_samgr_lite_path}/interfaces/innerkits/registry", + "${ability_lite_samgr_lite_path}/interfaces/interfaces/innerkits/samgr", "//third_party/cJSON", ] deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:aafwk_abilityManager_lite", + "${ability_lite_samgr_lite_path}/samgr:samgr", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${communication_path}/ipc/interfaces/innerkits/c/ipc:ipc_single", "${hilog_lite_path}/frameworks/featured:hilog_shared", - "${samgr_lite_path}/samgr:samgr", "//build/lite/config/component/cJSON:cjson_shared", ]