diff --git a/bundle.json b/bundle.json index bfac6ee58c82c90cdf21ed45c485c281a08babe4..610f01e4a935a2096b2a8657dc6d81b6f237ca8b 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 e8caea0c1e7e23cdc0df1de6345449aeb1b88c1f..f5eaaa6eebe314c0e2845a0970bbb7a621e98bf3 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -110,8 +110,8 @@ lite_library("ability") { "${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", + "${graphic_path}/surface_lite/interfaces/kits", + "${graphic_path}/../arkui/ui_lite/frameworks", "${ability_lite_samgr_lite_path}/interfaces/kits/registry", "${ability_lite_samgr_lite_path}/interfaces/kits/samgr", "//third_party/bounds_checking_function/include", @@ -131,7 +131,7 @@ lite_library("ability") { cflags_cc = cflags if (enable_ohos_appexecfwk_feature_ability == true) { - public_deps += [ "${graphic_path}/ui:ui_lite" ] + public_deps += [ "${graphic_path}/../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 d7da17b10066e60c289e8c3414b58407715b46be..0546e47f9725ffd661a3e490f743d06f07566411 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", "${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", + "${graphic_path}/graphic_utils_lite/interfaces/innerkits", + "${graphic_path}/../arkui/ui_lite/interfaces/kits", + "${graphic_path}/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 += [ "${graphic_path}/ui:ui_lite" ] + deps += [ "${graphic_path}/../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 f9e860290e8541a7e7ad28387ca8678a21feadb4..da0c398d77fb38f68b642281df60729e73c8ee0d 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -139,7 +139,7 @@ lite_library("abilityms") { } if (enable_ohos_appexecfwk_feature_ability == true) { - deps += [ "${graphic_path}/surface" ] + deps += [ "${graphic_path}/surface_lite" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } @@ -161,7 +161,7 @@ lite_library("abilityms") { "${utils_lite_path}/memory/include", "${dmsfwk_lite_path}/interfaces/innerkits", "${communication_path}/ipc/interfaces/innerkits/c/ipc/include", - "${graphic_path}/wms/interfaces/innerkits", + "${graphic_path}/../window/window_manager_lite/interfaces/innerkits", "${ability_lite_samgr_lite_path}/interfaces/kits/registry", "${ability_lite_samgr_lite_path}/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 25f1eda6957fbf3576afef8fb6b6e394bc649443..b229ac0ecde77d430a044b5697f86a439bf1b958 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -53,9 +53,9 @@ executable("aa") { if (enable_ohos_appexecfwk_feature_ability == true) { deps += [ - "${graphic_path}/surface", - "${graphic_path}/ui:ui_lite", - "${graphic_path}/utils:graphic_utils_lite", + "${graphic_path}/../arkui/ui_lite:ui_lite", + "${graphic_path}/graphic_utils_lite:utils_lite", + "${graphic_path}/surface_lite", ] } include_dirs = [