diff --git a/BUILD.gn b/BUILD.gn index 493f3f8221f9af968461b1bb2b0ca79dbd862657..ef1e0ff63567531bdd0b2d0315d56669f6f464ce 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -27,11 +27,11 @@ ndk_lib("native_api") { } deps = [ "//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/inner_api/kv_store:utils_kv_store" ] head_files = [ - "//utils/native/lite/include/kv_store.h", - "//utils/native/lite/include/utils_config.h", + "//commonlibrary/utils_lite/include/kv_store.h", + "//commonlibrary/utils_lite/include/utils_config.h", ] if (ohos_kernel_type == "liteos_m") { deps += [ "file:native_file" ] - head_files += [ "//utils/native/lite/include/utils_file.h" ] + head_files += [ "//commonlibrary/utils_lite/include/utils_file.h" ] } } diff --git a/README.md b/README.md index 54a449b6fad455e83ac292e361cb2e314f09a0f3..cda7de211b2732fa64bf7aef01620225d8aa8827 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ The Utils library provides the following capabilities on different platforms: ## Directory Structure ``` -utils/native/lite/ # Root directory +commonlibrary/utils_lite/ # Root directory ├── file # Implementation of the file system APIs ├── hals # HAL directory │ └── file # Header files of the hardware abstraction layer for file operations diff --git a/README_zh.md b/README_zh.md index 331af9b17c679cd0b7b89ca2be68ac5ce9e059bf..0492f5a766c74040cf0bc1af8b63deeafc972fea 100644 --- a/README_zh.md +++ b/README_zh.md @@ -66,7 +66,7 @@ ## 目录 ``` -utils/native/lite/ # 公共基础库根目录 +commonlibrary/utils_lite/ # 公共基础库根目录 ├── file # 文件接口实现 ├── hals # HAL目录 │ └── file # 文件操作硬件抽象层头文件 diff --git a/memory/bundle.json b/bundle.json similarity index 52% rename from memory/bundle.json rename to bundle.json index 41c06cd31af7c96e2cf9ac4ce6e7a8acaf808cbc..6b8aa0d35ea96a0ac7f086a3e5407e221af201a2 100644 --- a/memory/bundle.json +++ b/bundle.json @@ -1,38 +1,31 @@ { - "name": "@openharmony/memory", + "name": "@openharmony/utils_lite", "version": "3.1.0", "license": "Apache License 2.0", - "description": "memory", + "description": "Basic macro and type definitions", "publishAs": "code-segment", "segment": { - "destPath": "utils/native/lite/memory" + "destPath": "commonlibrary/utils_lite" }, "dirs": {}, "scripts": {}, "author": {}, "repository": "", "component": { - "name": "memory", - "subsystem": "utils", + "name": "utils_lite", + "subsystem": "commonlibrary", "features": [], "adapted_system_type": [ "mini", "small" ], - "rom": "", - "ram": "", - "deps": { - "thrid_party": [], - "kernel_special": {}, - "board_special": {}, - "components": [ - "utils_lite" - ] - }, + "rom": "0KB", + "ram": "0KB", + "deps": {}, "build": { "sub_component": [], "inner_kits": [], "test": [] } } -} +} \ No newline at end of file diff --git a/file/BUILD.gn b/file/BUILD.gn index 8533e338e7262355ed0e0bcb740670bde9ddf5d9..07e2b07b6cac3342e66bc0633026d6450eb19961 100644 --- a/file/BUILD.gn +++ b/file/BUILD.gn @@ -9,15 +9,15 @@ # 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. +# limitations under the License. import("//build/lite/config/component/lite_component.gni") static_library("native_file") { sources = [ "src/file_impl_hal/file.c" ] include_dirs = [ - "//utils/native/lite/include", - "//utils/native/lite/hals/file", + "//commonlibrary/utils_lite/include", + "//commonlibrary/utils_lite/hals/file", ] deps = [ "$ohos_board_adapter_dir/hals/utils/file:hal_file_static" ] } diff --git a/file/bundle.json b/file/bundle.json index 9ffdecd26745a5545b541f4076643d46e4fdf760..88f0d5c085a07bfde59f75c4151713ac2f865953 100644 --- a/file/bundle.json +++ b/file/bundle.json @@ -5,7 +5,7 @@ "description": "", "publishAs": "code-segment", "segment": { - "destPath": "utils/native/lite/file" + "destPath": "commonlibrary/utils_lite/file" }, "dirs": {}, "scripts": {}, @@ -13,7 +13,7 @@ "repository": "", "component": { "name": "file", - "subsystem": "utils", + "subsystem": "commonlibrary", "features": [], "adapted_system_type": [ "mini", @@ -32,7 +32,7 @@ ] }, "build": { - "sub_component": [ "//utils/native/lite/file:file" ], + "sub_component": [ "//commonlibrary/utils_lite/file:file" ], "inner_kits": [], "test": [] } diff --git a/js/builtin/BUILD.gn b/js/builtin/BUILD.gn index 7c5a7d7482f495952458917ce7192bf3d2672439..4391cc6d7314b43483df7af3ea0a915b40bf9848 100644 --- a/js/builtin/BUILD.gn +++ b/js/builtin/BUILD.gn @@ -11,7 +11,7 @@ # 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. -# +# import("//build/lite/config/component/lite_component.gni") @@ -21,6 +21,6 @@ lite_component("ace_utils_kits") { "deviceinfokit:ace_kit_deviceinfo", "filekit:ace_kit_file", "kvstorekit:ace_kit_kvstore", - "//utils/native/lite/timer_task:ace_kit_timer", + "//commonlibrary/utils_lite/timer_task:ace_kit_timer", ] } diff --git a/js/builtin/bundle.json b/js/builtin/bundle.json index 1a0e279bc4cd884417d0e1cae6597ff0cb0ec05e..52c2fc25ea3e8bf5d1486e0e9e09f588aed88b4e 100644 --- a/js/builtin/bundle.json +++ b/js/builtin/bundle.json @@ -5,7 +5,7 @@ "description": "ace related kits", "publishAs": "code-segment", "segment": { - "destPath": "utils/native/lite/js/builtin" + "destPath": "commonlibrary/utils_lite/js/builtin" }, "dirs": {}, "scripts": {}, @@ -13,7 +13,7 @@ "repository": "", "component": { "name": "js_builtin", - "subsystem": "utils", + "subsystem": "commonlibrary", "features": [], "adapted_system_type": [ "mini", @@ -38,7 +38,7 @@ ] }, "build": { - "sub_component": [ "//utils/native/lite/js/builtin:ace_utils_kits" ], + "sub_component": [ "//commonlibrary/utils_lite/js/builtin:ace_utils_kits" ], "inner_kits": [], "test": [] } diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index 54324e9107bcd0b7e5380ba31fa29f5120182d60..c3392539ef18f07ca710f497cab27b290af65d5b 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -18,24 +18,24 @@ import("//build/ohos.gni") ohos_static_library("ace_kit_common_simulator") { include_dirs = [ - "//utils/native/lite/js/builtin/common/include", + "//commonlibrary/utils_lite/js/builtin/common/include", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", ] - sources = [ "//utils/native/lite/js/builtin/common/src/nativeapi_common.cpp" ] + sources = [ + "//commonlibrary/utils_lite/js/builtin/common/src/nativeapi_common.cpp", + ] } ohos_static_library("ace_kit_deviceinfo_simulator") { include_dirs = [ - "//utils/native/lite/js/builtin/deviceinfokit/include", - "//utils/native/lite/js/builtin/common/include", + "//commonlibrary/utils_lite/js/builtin/deviceinfokit/include", + "//commonlibrary/utils_lite/js/builtin/common/include", "//base/startup/syspara_lite/interfaces/kits", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "//base/global/resource_management_lite/interfaces/inner_api/include", ] - sources = [ - "//utils/native/lite/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp", - ] + sources = [ "//commonlibrary/utils_lite/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp" ] deps = [ "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite", "//foundation/graphic/ui/huawei_proprietary/tools/ide:graphic_lite", @@ -62,15 +62,15 @@ config("aafwk_config") { ohos_static_library("ace_kit_file_simulator") { include_dirs = [ - "//utils/native/lite/js/builtin/filekit/include", - "//utils/native/lite/js/builtin/common/include", + "//commonlibrary/utils_lite/js/builtin/filekit/include", + "//commonlibrary/utils_lite/js/builtin/common/include", "//third_party/bounds_checking_function/include", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] sources = [ - "//utils/native/lite/js/builtin/filekit/src/nativeapi_fs.cpp", - "//utils/native/lite/js/builtin/filekit/src/nativeapi_fs_impl.c", + "//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs.cpp", + "//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs_impl.c", ] public_configs = [ ":aafwk_config" ] configs = [ ":storage_config" ] @@ -81,15 +81,15 @@ ohos_static_library("ace_kit_file_simulator") { ohos_static_library("ace_kit_kvstore_simulator") { include_dirs = [ - "//utils/native/lite/js/builtin/kvstorekit/include", - "//utils/native/lite/js/builtin/common/include", + "//commonlibrary/utils_lite/js/builtin/kvstorekit/include", + "//commonlibrary/utils_lite/js/builtin/common/include", "//third_party/bounds_checking_function/include", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] sources = [ - "//utils/native/lite/js/builtin/kvstorekit/src/nativeapi_kv.cpp", - "//utils/native/lite/js/builtin/kvstorekit/src/nativeapi_kv_impl.c", + "//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv.cpp", + "//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv_impl.c", ] public_configs = [ ":aafwk_config" ] configs = [ ":storage_config" ] diff --git a/kal/timer/BUILD.gn b/kal/timer/BUILD.gn index 70342f56418dcb34e28ea91f5462964836a5b581..76c1b7087c0d058c34c6babc18a15d06920958db 100644 --- a/kal/timer/BUILD.gn +++ b/kal/timer/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/lite/config/component/lite_component.gni") @@ -23,6 +23,6 @@ lite_library("kal_timer") { include_dirs = [ "include", - "//utils/native/lite/include", + "//commonlibrary/utils_lite/include", ] } diff --git a/kal/timer/bundle.json b/kal/timer/bundle.json index 4e4edc816459fb9aa647d374d84d4f343f2cb7e8..44eab0426eb763b2c80d2d407d037a1ec7f63694 100644 --- a/kal/timer/bundle.json +++ b/kal/timer/bundle.json @@ -5,7 +5,7 @@ "description": "", "publishAs": "code-segment", "segment": { - "destPath": "utils/native/lite/kal/timer" + "destPath": "commonlibrary/utils_lite/kal/timer" }, "dirs": {}, "scripts": {}, @@ -13,7 +13,7 @@ "repository": "", "component": { "name": "kal_timer", - "subsystem": "utils", + "subsystem": "commonlibrary", "features": [], "adapted_system_type": [ "mini", @@ -30,7 +30,7 @@ ] }, "build": { - "sub_component": [ "//utils/native/lite/kal/timer:kal_timer" ], + "sub_component": [ "//commonlibrary/utils_lite/kal/timer:kal_timer" ], "inner_kits": [], "test": [] } diff --git a/timer_task/BUILD.gn b/timer_task/BUILD.gn index 49dff8755c802427c425464bb990acfe5f7990c2..1002e9a04e0d9973a3a2588b778a5e3924c5b35c 100644 --- a/timer_task/BUILD.gn +++ b/timer_task/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/lite/config/component/lite_component.gni") @@ -23,11 +23,11 @@ lite_library("ace_kit_timer") { include_dirs = [ "include", - "//utils/native/lite/include", - "//utils/native/lite/kal/timer/include", + "//commonlibrary/utils_lite/include", + "//commonlibrary/utils_lite/kal/timer/include", ] if (ohos_kernel_type == "liteos_a") { include_dirs += [ "//third_party/musl/include" ] } - public_deps = [ "//utils/native/lite/kal/timer:kal_timer" ] + public_deps = [ "//commonlibrary/utils_lite/kal/timer:kal_timer" ] } diff --git a/timer_task/bundle.json b/timer_task/bundle.json index 43487d1602dbac8480136680fb45d6270c23ad6e..ed50b1c0f8e76fd65994e887f522eac9303d31ce 100644 --- a/timer_task/bundle.json +++ b/timer_task/bundle.json @@ -5,7 +5,7 @@ "description": "ace timer kits", "publishAs": "code-segment", "segment": { - "destPath": "utils/native/lite/timer_task" + "destPath": "commonlibrary/utils_lite/timer_task" }, "dirs": {}, "scripts": {}, @@ -13,7 +13,7 @@ "repository": "", "component": { "name": "timer_task", - "subsystem": "utils", + "subsystem": "commonlibrary", "features": [], "adapted_system_type": [ "mini", @@ -30,7 +30,7 @@ ] }, "build": { - "sub_component": [ "//utils/native/lite/timer_task:ace_kit_timer" ], + "sub_component": [ "//commonlibrary/utils_lite/timer_task:ace_kit_timer" ], "inner_kits": [], "test": [] }