From 5c1eb431f1ea170b95688b88e4cc424391387f80 Mon Sep 17 00:00:00 2001 From: ChenJie Date: Thu, 15 Sep 2022 11:22:36 +0800 Subject: [PATCH 1/8] change part name from utils to commonlibrary Signed-off-by: ChenJie --- README.md | 2 +- README_ZH.md | 2 +- bundle.json | 10 +++++----- libdmabufheap/BUILD.gn | 2 +- libdmabufheap/test/BUILD.gn | 2 +- libpurgeablemem/BUILD.gn | 2 +- libpurgeablemem/test/BUILD.gn | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1f4c69f..28ec584 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ It provides management interfaces for speculative-type memory. It is mainly used System developers can add or remove this part by configuring the product definition JSON file under **/productdefine/common/products** to enable or disable this part: -` "utils:utils_memory":{} ` +` "commonlibrary:utils_memory":{} ` ## Repositories Involved diff --git a/README_ZH.md b/README_ZH.md index b69b35f..ab05bc9 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -73,7 +73,7 @@ 系统开发者可以通过配置productdefine/common/products下的产品定义json文件，增加或移除本部件，来启用或停用本部件。 -` "utils:utils_memory":{} ` +` "commonlibrary:utils_memory":{} ` ## 相关仓 diff --git a/bundle.json b/bundle.json index 17cce0a..7194209 100644 --- a/bundle.json +++ b/bundle.json @@ -9,7 +9,7 @@ "license": "Apache License 2.0", "component": { "name": "utils_memory", - "subsystem": "utils", + "subsystem": "commonlibrary", "adapted_system_type": [ "standard" ], "deps": { "components": [ @@ -20,13 +20,13 @@ }, "build": { "sub_component": [ - "//utils/memory/libdmabufheap:libdmabufheap", - "//utils/memory/libpurgeablemem:libpurgeablemem" + "//commonlibrary/utils_memory/libdmabufheap:libdmabufheap", + "//commonlibrary/utils_memory/libpurgeablemem:libpurgeablemem" ], "inner_kits": [], "test": [ - "//utils/memory/libdmabufheap/test:unittest", - "//utils/memory/libpurgeablemem/test:libpurgeablemem_test" + "//commonlibrary/utils_memory/libdmabufheap/test:unittest", + "//commonlibrary/utils_memory/libpurgeablemem/test:libpurgeablemem_test" ] } } diff --git a/libdmabufheap/BUILD.gn b/libdmabufheap/BUILD.gn index ea42273..7b2622f 100644 --- a/libdmabufheap/BUILD.gn +++ b/libdmabufheap/BUILD.gn @@ -25,6 +25,6 @@ ohos_shared_library("libdmabufheap") { "hiviewdfx_hilog_native:libhilog", ] public_configs = [ ":libdmabufheap_config" ] - subsystem_name = "utils" + subsystem_name = "commonlibrary" part_name = "utils_memory" } diff --git a/libdmabufheap/test/BUILD.gn b/libdmabufheap/test/BUILD.gn index 4f525f3..1ee2c75 100644 --- a/libdmabufheap/test/BUILD.gn +++ b/libdmabufheap/test/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "libdmabufheap/" ohos_unittest("DmabufAllocTest") { module_out_path = module_output_path sources = [ "unittest/libdmabufheap/dmabuf_alloc_test.cpp" ] - deps = [ "//utils/memory/libdmabufheap:libdmabufheap" ] + deps = [ "//commonlibrary/utils_memory/libdmabufheap:libdmabufheap" ] } group("unittest") { diff --git a/libpurgeablemem/BUILD.gn b/libpurgeablemem/BUILD.gn index a43d62f..a481f0d 100644 --- a/libpurgeablemem/BUILD.gn +++ b/libpurgeablemem/BUILD.gn @@ -38,6 +38,6 @@ ohos_shared_library("libpurgeablemem") { "hiviewdfx_hilog_native:libhilog", ] public_configs = [ ":libpurgeable_config" ] - subsystem_name = "utils" + subsystem_name = "commonlibrary" part_name = "utils_memory" } diff --git a/libpurgeablemem/test/BUILD.gn b/libpurgeablemem/test/BUILD.gn index a638191..850434f 100644 --- a/libpurgeablemem/test/BUILD.gn +++ b/libpurgeablemem/test/BUILD.gn @@ -19,7 +19,7 @@ module_output_path = "libpurgeablemem/" purgeable_deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//utils/memory/libpurgeablemem:libpurgeablemem", + "//commonlibrary/utils_memory/libpurgeablemem:libpurgeablemem", ] purgeable_external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -35,7 +35,7 @@ ohos_unittest("purgeable_c_test") { public_deps = purgeable_public_deps } - subsystem_name = "utils" + subsystem_name = "commonlibrary" part_name = "utils_memory" } @@ -48,7 +48,7 @@ ohos_unittest("purgeable_cpp_test") { public_deps = purgeable_public_deps } - subsystem_name = "utils" + subsystem_name = "commonlibrary" part_name = "utils_memory" } -- Gitee From a126646ea7338765c3ddf2e33036668c3ec6a485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 11:57:57 +0000 Subject: [PATCH 2/8] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28ec584..9e7e3a0 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ It provides management interfaces for speculative-type memory. It is mainly used System developers can add or remove this part by configuring the product definition JSON file under **/productdefine/common/products** to enable or disable this part: -` "commonlibrary:utils_memory":{} ` +` "commonlibrary:memory_utils":{} ` ## Repositories Involved -- Gitee From 339c2ffaa272bf406b0b6345e6e437f31d492525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 11:58:30 +0000 Subject: [PATCH 3/8] update README_ZH.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- README_ZH.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH.md b/README_ZH.md index ab05bc9..f03a8ba 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -73,7 +73,7 @@ 系统开发者可以通过配置productdefine/common/products下的产品定义json文件，增加或移除本部件，来启用或停用本部件。 -` "commonlibrary:utils_memory":{} ` +` "commonlibrary:memory_utils":{} ` ## 相关仓 -- Gitee From eef99db5b0a2ca0016b1284b39e1e34d8503fb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 11:59:36 +0000 Subject: [PATCH 4/8] update bundle.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- bundle.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index 7194209..f2e5f75 100644 --- a/bundle.json +++ b/bundle.json @@ -1,5 +1,5 @@ { - "name": "@ohos/utils_memory", + "name": "@ohos/commonlibrary_memory_utils", "version": "3.1.0", "description": "memory base libraries", "publishAs": "source", @@ -8,7 +8,7 @@ "repository": "", "license": "Apache License 2.0", "component": { - "name": "utils_memory", + "name": "memory_utils", "subsystem": "commonlibrary", "adapted_system_type": [ "standard" ], "deps": { @@ -20,13 +20,13 @@ }, "build": { "sub_component": [ - "//commonlibrary/utils_memory/libdmabufheap:libdmabufheap", - "//commonlibrary/utils_memory/libpurgeablemem:libpurgeablemem" + "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", + "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem" ], "inner_kits": [], "test": [ - "//commonlibrary/utils_memory/libdmabufheap/test:unittest", - "//commonlibrary/utils_memory/libpurgeablemem/test:libpurgeablemem_test" + "//commonlibrary/memory_utils/libdmabufheap/test:unittest", + "//commonlibrary/memory_utils/libpurgeablemem/test:libpurgeablemem_test" ] } } -- Gitee From 24a93745965489569660da2de30cb63b2f955e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 12:00:58 +0000 Subject: [PATCH 5/8] update libdmabufheap/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- libdmabufheap/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdmabufheap/BUILD.gn b/libdmabufheap/BUILD.gn index 7b2622f..4237dc1 100644 --- a/libdmabufheap/BUILD.gn +++ b/libdmabufheap/BUILD.gn @@ -26,5 +26,5 @@ ohos_shared_library("libdmabufheap") { ] public_configs = [ ":libdmabufheap_config" ] subsystem_name = "commonlibrary" - part_name = "utils_memory" + part_name = "memory_utils" } -- Gitee From f4b25ad85bbec09a621ec956562d4d4ead9248ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 12:01:38 +0000 Subject: [PATCH 6/8] update libdmabufheap/test/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- libdmabufheap/test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdmabufheap/test/BUILD.gn b/libdmabufheap/test/BUILD.gn index 1ee2c75..0bd682b 100644 --- a/libdmabufheap/test/BUILD.gn +++ b/libdmabufheap/test/BUILD.gn @@ -18,7 +18,7 @@ module_output_path = "libdmabufheap/" ohos_unittest("DmabufAllocTest") { module_out_path = module_output_path sources = [ "unittest/libdmabufheap/dmabuf_alloc_test.cpp" ] - deps = [ "//commonlibrary/utils_memory/libdmabufheap:libdmabufheap" ] + deps = [ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap" ] } group("unittest") { -- Gitee From 6475098d3c3b9857437f57ceb134332b4e418a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 12:02:12 +0000 Subject: [PATCH 7/8] update libpurgeablemem/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- libpurgeablemem/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpurgeablemem/BUILD.gn b/libpurgeablemem/BUILD.gn index a481f0d..41f682f 100644 --- a/libpurgeablemem/BUILD.gn +++ b/libpurgeablemem/BUILD.gn @@ -39,5 +39,5 @@ ohos_shared_library("libpurgeablemem") { ] public_configs = [ ":libpurgeable_config" ] subsystem_name = "commonlibrary" - part_name = "utils_memory" + part_name = "memory_utils" } -- Gitee From b255f27285d06e533ee823d73c125b2f2b18edc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9D=B0?= Date: Mon, 26 Sep 2022 12:02:56 +0000 Subject: [PATCH 8/8] update libpurgeablemem/test/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈杰 --- libpurgeablemem/test/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpurgeablemem/test/BUILD.gn b/libpurgeablemem/test/BUILD.gn index 850434f..5bc7e9d 100644 --- a/libpurgeablemem/test/BUILD.gn +++ b/libpurgeablemem/test/BUILD.gn @@ -19,7 +19,7 @@ module_output_path = "libpurgeablemem/" purgeable_deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//commonlibrary/utils_memory/libpurgeablemem:libpurgeablemem", + "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem", ] purgeable_external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -36,7 +36,7 @@ ohos_unittest("purgeable_c_test") { } subsystem_name = "commonlibrary" - part_name = "utils_memory" + part_name = "memory_utils" } ohos_unittest("purgeable_cpp_test") { @@ -49,7 +49,7 @@ ohos_unittest("purgeable_cpp_test") { } subsystem_name = "commonlibrary" - part_name = "utils_memory" + part_name = "memory_utils" } group("libpurgeablemem_test") { -- Gitee