diff --git a/filemanagement_aafwk.gni b/filemanagement_aafwk.gni index 3b87d4be1ddaf28c77cd506bf975e709ba9cf701..541b34b8bfef1b423ec76e162f3a7bb6eb5c99c2 100644 --- a/filemanagement_aafwk.gni +++ b/filemanagement_aafwk.gni @@ -11,8 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_inner_api_path = - "//foundation/ability/ability_runtime/interfaces/inner_api" -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" -aafwk_path = "//foundation/ability/ability_runtime" -aafwk_services_path = "//foundation/ability/ability_runtime/services" +ability_runtime_path = "//foundation/ability/ability_runtime" +ability_runtime_innerkits_path = "${ability_runtime_path}/interfaces/inner_api" +ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" +ability_runtime_services_path = "${ability_runtime_path}/services" diff --git a/frameworks/innerkits/file_access/BUILD.gn b/frameworks/innerkits/file_access/BUILD.gn index 79a2c34095416004d5280e1313acad1497097864..49ad54154116b07cec0ab054e21dfbc48e53abc5 100644 --- a/frameworks/innerkits/file_access/BUILD.gn +++ b/frameworks/innerkits/file_access/BUILD.gn @@ -21,11 +21,11 @@ config("ability_config") { include_dirs = [ "include", "${BASE_DIR}/utils", - "${aafwk_services_path}/common/include", - "${aafwk_kits_path}/ability/native/include/continuation/distributed", - "${aafwk_kits_path}/ability/native/include/continuation/kits", - "${aafwk_kits_path}/appkit/native/app/include", - "${aafwk_path}/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_services_path}/common/include", + "${ability_runtime_kits_path}/ability/native/include/continuation/distributed", + "${ability_runtime_kits_path}/ability/native/include/continuation/kits", + "${ability_runtime_kits_path}/appkit/native/app/include", + "${ability_runtime_path}/frameworks/js/napi/aafwk/inner/napi_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", ] @@ -40,9 +40,9 @@ config("ability_public_config") { include_dirs = [ "include", "${BASE_DIR}/utils", - "${aafwk_kits_path}/appkit/native/ability_runtime/app", - "${aafwk_kits_path}/appkit/native/app/include", - "${aafwk_kits_path}/appkit/native/ability_runtime/context", + "${ability_runtime_kits_path}/appkit/native/ability_runtime/app", + "${ability_runtime_kits_path}/appkit/native/app/include", + "${ability_runtime_kits_path}/appkit/native/ability_runtime/context", ] } @@ -56,12 +56,12 @@ ohos_shared_library("file_access_extension_ability_kit") { configs = [ ":ability_config" ] public_configs = [ ":ability_public_config", - "${aafwk_path}/frameworks/native/ability:ability_context_public_config", + "${ability_runtime_path}/frameworks/native/ability:ability_context_public_config", ] deps = [ - "${aafwk_path}/frameworks/native/ability/native:abilitykit_native", - "${aafwk_path}/frameworks/native/appkit:app_context", + "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", + "${ability_runtime_path}/frameworks/native/appkit:app_context", ] external_deps = [ @@ -95,7 +95,7 @@ ohos_shared_library("file_access_extension_ability_module") { deps = [ ":file_access_extension_ability_kit", - "${aafwk_path}/frameworks/native/ability/native:abilitykit_native", + "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", ] external_deps = [ diff --git a/services/BUILD.gn b/services/BUILD.gn index b68fe12568cba79116620eecd50395b3e1c14dd2..779ccbef245d5fe00255b1a3c51b5e16376be4b2 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -59,8 +59,8 @@ ohos_shared_library("fms_server") { ] deps = [ - "${aafwk_path}/frameworks/native/ability/native:abilitykit_native", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", + "${ability_runtime_services_path}/abilitymgr:abilityms", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/filemanagement/storage_service/interfaces/innerkits/storage_manager/native:storage_manager_sa_proxy", "//foundation/filemanagement/storage_service/services/storage_manager:storage_manager",