From 8fce922bcb959e9478a03429c2c09c177c4ae420 Mon Sep 17 00:00:00 2001 From: XKK Date: Thu, 4 May 2023 09:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: XKK --- ability_lite.gni | 25 ++++++++++ frameworks/ability_lite/BUILD.gn | 41 ++++++++-------- frameworks/ability_lite/example/BUILD.gn | 12 ++--- frameworks/abilitymgr_lite/BUILD.gn | 32 ++++++------- frameworks/want_lite/BUILD.gn | 14 +++--- interfaces/kits/js/napi/BUILD.gn | 8 ++-- services/abilitymgr_lite/BUILD.gn | 48 +++++++++---------- services/abilitymgr_lite/tools/BUILD.gn | 23 ++++----- .../test_lv0/page_ability_test/BUILD.gn | 13 ++--- 9 files changed, 122 insertions(+), 94 deletions(-) create mode 100644 ability_lite.gni diff --git a/ability_lite.gni b/ability_lite.gni new file mode 100644 index 0000000..34055ed --- /dev/null +++ b/ability_lite.gni @@ -0,0 +1,25 @@ +# Copyright (c) 2021-2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +hilog_lite_path = "//base/hiviewdfx/hilog_lite" +permission_lite_path = "//base/security/permission_lite" +appapawn_lite_path = "//base/startup/appspawn/lite" +utils_lite_path = "//commonlibrary/utils_lite" + +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" +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 27e57ff..ffb6e04 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -14,6 +14,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") import("//build/lite/config/test.gni") import("//build/lite/ndk/ndk.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") generate_notice_file("ability_notice_file") { module_name = "ability" @@ -44,8 +45,8 @@ lite_library("ability") { public_deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:abilitymanager", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", - "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store", + "${hilog_lite_path}/frameworks/featured:hilog_static", + "${kv_store_path}/interfaces/inner_api/kv_store:kv_store", ] defines = [] @@ -56,8 +57,9 @@ lite_library("ability") { "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite/slite", "${aafwk_lite_path}/interfaces/kits/ability_lite", "${appexecfwk_lite_path}/utils/bundle_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${utils_lite_path}/memory/include", + "${samgr_lite_path}/interfaces/kits/registry", + "${samgr_lite_path}/interfaces/kits/samgr", ] } else { target_type = "shared_library" @@ -88,9 +90,9 @@ lite_library("ability") { public_deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:abilitymanager", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store", + "${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", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] @@ -104,14 +106,14 @@ lite_library("ability") { "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//commonlibrary/utils_lite/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/communication/ipc/ipc/native/c/manager/include", - "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include", - "//foundation/graphic/surface/interfaces/kits", - "//foundation/graphic/ui/frameworks", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${utils_lite_path}/include", + "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", + "${communication_path}/ipc/ipc/native/c/manager/include", + "${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", "//third_party/bounds_checking_function/include", "./include", "./", @@ -129,12 +131,11 @@ lite_library("ability") { cflags_cc = cflags if (enable_ohos_appexecfwk_feature_ability == true) { - public_deps += [ "//foundation/graphic/ui:ui_lite" ] + public_deps += [ "${graphic_path}/ui:ui_lite" ] } if (ohos_kernel_type == "liteos_m") { - include_dirs += - [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] + include_dirs += [ "${hilog_lite_path}/interfaces/native/kits/hilog_lite" ] } defines += [ "OPENHARMONY_FONT_PATH" ] @@ -156,7 +157,7 @@ unittest("ability_main_test_lv0") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/MainTest_lv0" - sources = [ "//foundation/ability/ability_lite/frameworks/ability_lite/unittest/ability_main_test.cpp" ] + sources = [ "${ability_lite_path}/frameworks/ability_lite/unittest/ability_main_test.cpp" ] include_dirs = [ "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite" ] } @@ -170,7 +171,7 @@ config("abilitykit_config") { "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", + "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", ] } diff --git a/frameworks/ability_lite/example/BUILD.gn b/frameworks/ability_lite/example/BUILD.gn index bd72b3d..d7da17b 100644 --- a/frameworks/ability_lite/example/BUILD.gn +++ b/frameworks/ability_lite/example/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") - +import("//foundation/ability/ability_lite/ability_lite.gni") src_path = "${aafwk_lite_path}/frameworks/ability_lite/example/entry/src/main/cpp" @@ -42,10 +42,10 @@ lite_library("hiability") { "${aafwk_lite_path}/interfaces/kits/want_lite", "${appexefwk_lite_path}/interfaces/kits/bundle_lite", "${appexefwk_lite_path}/utils/bundle_lite", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/graphic/utils/interfaces/innerkits", - "//foundation/graphic/ui/interfaces/kits", - "//foundation/graphic/utils/interfaces/kits/gfx_utils", + "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", + "${graphic_path}/utils/interfaces/innerkits", + "${graphic_path}/ui/interfaces/kits", + "${graphic_path}/utils/interfaces/kits/gfx_utils", ] deps = [ "${aafwk_lite_path}/frameworks/ability_lite:aafwk_abilitykit_lite" ] @@ -53,7 +53,7 @@ lite_library("hiability") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] if (enable_ohos_appexecfwk_feature_ability == true) { - deps += [ "//foundation/graphic/ui:ui_lite" ] + deps += [ "${graphic_path}/ui:ui_lite" ] defines += [ "ENABLE_WINDOW=1", "ABILITY_WINDOW_SUPPORT", diff --git a/frameworks/abilitymgr_lite/BUILD.gn b/frameworks/abilitymgr_lite/BUILD.gn index 37590cb..a3be87c 100644 --- a/frameworks/abilitymgr_lite/BUILD.gn +++ b/frameworks/abilitymgr_lite/BUILD.gn @@ -13,6 +13,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") import("//build/lite/config/test.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") lite_library("abilitymanager") { if (ohos_kernel_type == "liteos_m") { @@ -24,7 +25,7 @@ lite_library("abilitymanager") { "src/slite/abilityms_slite_client.cpp", ] - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static" ] + deps = [ "${hilog_lite_path}/frameworks/featured:hilog_static" ] include_dirs = [ "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite", @@ -35,10 +36,10 @@ lite_library("abilitymanager") { "${aafwk_lite_path}/services/abilitymgr_lite/include/util", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${utils_lite_path}/include", + "${utils_lite_path}/memory/include", + "${samgr_lite_path}/interfaces/kits/registry", + "${samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", "./include/slite", ] @@ -55,8 +56,8 @@ lite_library("abilitymanager") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", + "${communication_path}/ipc/interfaces/innerkits/c/ipc:ipc_single", + "${hilog_lite_path}/frameworks/featured:hilog_shared", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] @@ -72,12 +73,12 @@ lite_library("abilitymanager") { "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${utils_lite_path}/include", + "${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", "//third_party/bounds_checking_function/include", "./include", "./", @@ -85,8 +86,7 @@ lite_library("abilitymanager") { } if (ohos_kernel_type == "liteos_m") { - include_dirs += - [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] + include_dirs += [ "${hilog_lite_path}/interfaces/native/kits/hilog_lite" ] } } @@ -94,7 +94,7 @@ unittest("ability_manager_inner_test") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/ManagerInnerTest_lv0" - sources = [ "//foundation/ability/ability_lite/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp" ] + sources = [ "${ability_lite_path}/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp" ] } lite_component("aafwk_abilityManager_lite") { diff --git a/frameworks/want_lite/BUILD.gn b/frameworks/want_lite/BUILD.gn index 72adf3f..9545be7 100644 --- a/frameworks/want_lite/BUILD.gn +++ b/frameworks/want_lite/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") generate_notice_file("want_notice_file") { module_name = "want" @@ -30,9 +31,9 @@ static_library("want") { include_dirs = [ "include", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", + "${utils_lite_path}/include", + "${utils_lite_path}/memory/include", + "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", "//third_party/bounds_checking_function/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", @@ -41,11 +42,10 @@ static_library("want") { ] if (ohos_kernel_type == "liteos_m") { - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static" ] - include_dirs += - [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] + deps = [ "${hilog_lite_path}/frameworks/featured:hilog_static" ] + include_dirs += [ "${hilog_lite_path}/interfaces/native/kits/hilog_lite" ] } else { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ] + deps = [ "${hilog_lite_path}/frameworks/featured:hilog_shared" ] } } diff --git a/interfaces/kits/js/napi/BUILD.gn b/interfaces/kits/js/napi/BUILD.gn index 30b4972..0f5df06 100755 --- a/interfaces/kits/js/napi/BUILD.gn +++ b/interfaces/kits/js/napi/BUILD.gn @@ -12,11 +12,11 @@ # limitations under the License. import("//build/ohos.gni") - +import("//foundation/ability/ability_lite/ability_lite.gni") ohos_shared_library("aafwk") { include_dirs = [ "//third_party/node/src", - "//foundation/arkui/napi/interfaces/kits", + "${arkui_path}/napi/interfaces/kits", ] cflags = [ @@ -27,8 +27,8 @@ ohos_shared_library("aafwk") { sources = [ "js_aafwk.cpp" ] deps = [ - "//foundation/ability/ability_lite/frameworks/abilitymgr_lite:abilitymanager", - "//foundation/arkui/napi/:ace_napi", + "${ability_lite_path}/frameworks/abilitymgr_lite:abilitymanager", + "${arkui_path}/napi/:ace_napi", ] external_deps = [ diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index 740ae0e..6e2a682 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") import( "//foundation/bundlemanager/bundle_framework_lite/bundle_framework_lite.gni") @@ -51,9 +52,9 @@ lite_library("abilityms") { } deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", - "//foundation/arkui/ace_engine_lite/frameworks:ace_lite", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", + "${ace_engine_lite_path}/frameworks:ace_lite", + "${hilog_lite_path}/frameworks/featured:hilog_static", + "${samgr_lite_path}/samgr:samgr", ] include_dirs = [ @@ -65,11 +66,11 @@ lite_library("abilityms") { "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//foundation/ability/dmsfwk_lite/interfaces/innerkits", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${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", "//third_party/bounds_checking_function/include", "./include/slite", "./include/util", @@ -117,9 +118,9 @@ lite_library("abilityms") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", + "${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" ] @@ -130,7 +131,7 @@ lite_library("abilityms") { } if (enable_ohos_appexecfwk_feature_ability == true) { - deps += [ "//foundation/graphic/surface" ] + deps += [ "${graphic_path}/surface" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } @@ -145,16 +146,16 @@ lite_library("abilityms") { "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//base/security/permission_lite/interfaces/kits", - "//base/security/permission_lite/services/pms/include", - "//base/startup/appspawn/lite", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//foundation/ability/dmsfwk_lite/interfaces/innerkits", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/graphic/wms/interfaces/innerkits", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${permission_lite_path}/interfaces/kits", + "${permission_lite_path}/services/pms/include", + "${appapawn_lite_path}", + "${utils_lite_path}/include", + "${utils_lite_path}/memory/include", + "${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", "//third_party/bounds_checking_function/include", "//third_party/cJSON", "include", @@ -179,8 +180,7 @@ lite_library("abilityms") { ] if (ohos_kernel_type == "liteos_m") { - include_dirs += - [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] + include_dirs += [ "${hilog_lite_path}/interfaces/native/kits/hilog_lite" ] } } diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index e281b88..22e4332 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") lite_component("tools_lite") { features = [ ":aa" ] @@ -43,18 +44,18 @@ executable("aa") { deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:aafwk_abilityManager_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "${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", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] if (enable_ohos_appexecfwk_feature_ability == true) { deps += [ - "//foundation/graphic/surface", - "//foundation/graphic/ui:ui_lite", - "//foundation/graphic/utils:graphic_utils_lite", + "${graphic_path}/surface", + "${graphic_path}/ui:ui_lite", + "${graphic_path}/utils:graphic_utils_lite", ] } include_dirs = [ @@ -66,10 +67,10 @@ executable("aa") { "${aafwk_lite_path}/frameworks/want_lite/include", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", - "//commonlibrary/utils_lite/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "${utils_lite_path}/include", + "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", + "${samgr_lite_path}/interfaces/kits/registry", + "${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 45b6c06..b6cb865 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 @@ -13,6 +13,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") +import("//foundation/ability/ability_lite/ability_lite.gni") unittest("ability_test_pageAbilityTest_lv0") { output_extension = "bin" @@ -37,19 +38,19 @@ unittest("ability_test_pageAbilityTest_lv0") { "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/kits/appkit_lite/appkit_utils/include", - "//commonlibrary/utils_lite/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", + "${utils_lite_path}/include", + "${samgr_lite_path}/interfaces/innerkits/registry", + "${samgr_lite_path}/interfaces/interfaces/innerkits/samgr", "//third_party/cJSON", ] deps = [ "${aafwk_lite_path}/frameworks/abilitymgr_lite:aafwk_abilityManager_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "${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", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] -- Gitee