From a04815e0eeb4fd8dfd2ba475e1ca61b688042db4 Mon Sep 17 00:00:00 2001 From: zhouyj Date: Sun, 5 Mar 2023 17:05:40 +0800 Subject: [PATCH] Description: change component name for ui, utils, surface and wms IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I6JUIU Feature or Bugfix: Feature Binary Source:No Signed-off-by: zhouyj Change-Id: I8c30b3d0c7f4649748d6fccfe1f1daabb5b5ea8d --- BUILD.gn | 10 +++++----- README.md | 4 ++-- README_zh.md | 4 ++-- bundle.json | 4 ++-- test/unittest/BUILD.gn | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 1c424bf..4902ead 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,12 +13,12 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/graphic/config.gni") import("//build/lite/ndk/ndk.gni") -lite_component("lite_ui") { +lite_component("ui_lite") { features = [ ":ui" ] public_deps = features } -ndk_lib("lite_ui_ndk") { +ndk_lib("ui_lite_ndk") { lib_extension = ".so" deps = [ ":ui" ] head_files = [ "interfaces/kits" ] @@ -248,9 +248,9 @@ lite_library("ui") { include_dirs = [ "frameworks" ] deps = [ "//build/lite/config/component/cJSON:cjson_shared", - "//foundation/graphic/surface:lite_surface", + "//foundation/graphic/surface:surface_lite", "//foundation/graphic/utils:lite_graphic_hals", - "//foundation/graphic/wms:lite_wms", + "//foundation/graphic/wms:window_manager_lite", "//third_party/bounds_checking_function:libsec_shared", "//third_party/freetype:freetype", "//third_party/giflib:libgif", @@ -276,7 +276,7 @@ lite_library("ui") { ldflags = [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ] } - public_deps = [ "//foundation/graphic/utils:lite_graphic_utils" ] + public_deps = [ "//foundation/graphic/utils:graphic_utils_lite" ] public_configs = [ ":graphic_define_config" ] if (board_toolchain_type != "iccarm") { cflags = [ diff --git a/README.md b/README.md index 3c16bd6..3b32ce2 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,9 @@ Platform Constraints ``` # Generate the libui.so file in the out directory of the product folder through GN compilation. -hb build -T //foundation/graphic/ui:lite_ui -f #build libui.so +hb build -T //foundation/graphic/ui:ui_lite -f #build libui.so hb build -T //foundation/graphic/wms/test:sample_ui -f # build UI demo -hb build -T //foundation/graphic/ui/test/unittest:lite_graphic_ui_test -f # build TDD testcases +hb build -T //foundation/graphic/ui/test/unittest:arkui_ui_lite_test -f # build TDD testcases # To compile the Qt library, see the Qt simulator project at graphic/ui/tools/qt/simulator/simulator.pro. ``` diff --git a/README_zh.md b/README_zh.md index e667c8c..e739bd0 100644 --- a/README_zh.md +++ b/README_zh.md @@ -72,9 +72,9 @@ ``` # 通过gn编译,在out目录下对应产品的文件夹中生成图形库 -hb build -T //foundation/graphic/ui:lite_ui -f # 编译libui.so +hb build -T //foundation/graphic/ui:ui_lite -f # 编译libui.so hb build -T //foundation/graphic/wms/test:sample_ui -f # 编译UI用例 -hb build -T //foundation/graphic/ui/test/unittest:lite_graphic_ui_test -f # 编译TDD用例 +hb build -T //foundation/graphic/ui/test/unittest:arkui_ui_lite_test -f # 编译TDD用例 # 编译qt库可直接参考qt模拟器工程:graphic/ui/tools/qt/simulator/simulator.pro ``` diff --git a/bundle.json b/bundle.json index 2229b33..9df06c7 100644 --- a/bundle.json +++ b/bundle.json @@ -26,8 +26,8 @@ }, "build": { "sub_component": [ - "//foundation/graphic/ui:lite_ui", - "//foundation/graphic/ui/test/unittest:lite_graphic_ui_test" + "//foundation/graphic/ui:ui_lite", + "//foundation/graphic/ui/test/unittest:arkui_ui_lite_test" ], "inner_kits": [], "test": [] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index e0c468d..1d7feaa 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -13,7 +13,7 @@ if (ohos_kernel_type != "liteos_m") { import("//build/lite/config/subsystem/graphic/config.gni") import("//build/lite/config/test.gni") - group("lite_graphic_ui_test") { + group("arkui_ui_lite_test") { if (ohos_build_type == "debug") { deps = [ ":graphic_test_ui_door" ] } @@ -116,6 +116,6 @@ if (ohos_kernel_type != "liteos_m") { } } } else { - group("lite_graphic_ui_test") { + group("arkui_ui_lite_test") { } } -- GitLab