From f6a386b28d23b4f0f36d137ef992fcd167168cf7 Mon Sep 17 00:00:00 2001 From: zhouyj Date: Wed, 19 Apr 2023 16:41:04 +0800 Subject: [PATCH] Description: change repo path for lite graphic IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I6WFDH Feature or Bugfix: Feature Binary Source:No Signed-off-by: zhouyj Change-Id: Ic92520baebe0fc5453e30696c80cb94d534bfe1b --- bundle.json | 6 +++--- frameworks/ability_lite/BUILD.gn | 6 +++--- frameworks/ability_lite/example/BUILD.gn | 8 ++++---- services/abilitymgr_lite/BUILD.gn | 4 ++-- services/abilitymgr_lite/tools/BUILD.gn | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bundle.json b/bundle.json index bfac6ee..610f01e 100644 --- a/bundle.json +++ b/bundle.json @@ -24,13 +24,13 @@ "components": [ "bundle_framework_lite", "kv_store", - "ui", - "surface", + "ui_lite", + "surface_lite", "hilog", "permission", "samgr_lite", "appspawn_lite", - "wms" + "window_manager_lite" ], "third_party": [ "bounds_checking_function", diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 27e57ff..0336e34 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -108,8 +108,8 @@ lite_library("ability") { "//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/graphic/surface_lite/interfaces/kits", + "//foundation/arkui/ui_lite/frameworks", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", @@ -129,7 +129,7 @@ lite_library("ability") { cflags_cc = cflags if (enable_ohos_appexecfwk_feature_ability == true) { - public_deps += [ "//foundation/graphic/ui:ui_lite" ] + public_deps += [ "//foundation/arkui/ui_lite:ui_lite" ] } if (ohos_kernel_type == "liteos_m") { diff --git a/frameworks/ability_lite/example/BUILD.gn b/frameworks/ability_lite/example/BUILD.gn index bd72b3d..538e77d 100644 --- a/frameworks/ability_lite/example/BUILD.gn +++ b/frameworks/ability_lite/example/BUILD.gn @@ -43,9 +43,9 @@ lite_library("hiability") { "${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", + "//foundation/graphic/graphic_utils_lite/interfaces/innerkits", + "//foundation/arkui/ui_lite/interfaces/kits", + "//foundation/graphic/graphic_utils_lite/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 += [ "//foundation/arkui/ui_lite:ui_lite" ] defines += [ "ENABLE_WINDOW=1", "ABILITY_WINDOW_SUPPORT", diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index bf48124..99fe4cc 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -123,7 +123,7 @@ lite_library("abilityms") { } if (enable_ohos_appexecfwk_feature_ability == true) { - deps += [ "//foundation/graphic/surface" ] + deps += [ "//foundation/graphic/surface_lite" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } @@ -145,7 +145,7 @@ lite_library("abilityms") { "//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/window/window_manager_lite/interfaces/innerkits", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index e281b88..0196b48 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -52,9 +52,9 @@ executable("aa") { if (enable_ohos_appexecfwk_feature_ability == true) { deps += [ - "//foundation/graphic/surface", - "//foundation/graphic/ui:ui_lite", - "//foundation/graphic/utils:graphic_utils_lite", + "//foundation/arkui/ui_lite:ui_lite", + "//foundation/graphic/graphic_utils_lite:utils_lite", + "//foundation/graphic/surface_lite", ] } include_dirs = [ -- Gitee