From 3ed921c45a4c13a34f5ec37e7f864dcd3f8c6b7f Mon Sep 17 00:00:00 2001 From: huangjie Date: Sat, 7 May 2022 11:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86innerkits=E4=BF=AE=E6=94=B9=E4=B8=BAin?= =?UTF-8?q?ner=5Fapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangjie --- README.md | 2 +- README_zh.md | 2 +- bundle.json | 2 +- frameworks/resmgr/BUILD.gn | 6 +++--- frameworks/resmgr/test/BUILD.gn | 2 +- interfaces/{innerkits => inner_api}/include/res_common.h | 0 interfaces/{innerkits => inner_api}/include/res_config.h | 0 .../{innerkits => inner_api}/include/resource_manager.h | 0 interfaces/{innerkits => inner_api}/include/rstate.h | 0 interfaces/js/kits/BUILD.gn | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename interfaces/{innerkits => inner_api}/include/res_common.h (100%) rename interfaces/{innerkits => inner_api}/include/res_config.h (100%) rename interfaces/{innerkits => inner_api}/include/resource_manager.h (100%) rename interfaces/{innerkits => inner_api}/include/rstate.h (100%) diff --git a/README.md b/README.md index 128637e..c37e10f 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The directory structure of the Resmgr module is as follows: │ │ │ ├── src # Implementation code │ │ │ └── test # Test code │ ├── interfaces # APIs -│ │ ├── innerkits # APIs for internal subsystems +│ │ ├── inner_api # APIs for internal subsystems │ │ └── js # JavaScript APIs ``` diff --git a/README_zh.md b/README_zh.md index a888905..72958b1 100644 --- a/README_zh.md +++ b/README_zh.md @@ -23,7 +23,7 @@ │ │ │ ├── src # 资源管理实现代码 │ │ │ └── test # 资源管理测试代码 │ ├── interfaces # 资源管理接口 -│ │ ├── innerkits # 资源管理对子系统间接口 +│ │ ├── inner_api # 资源管理对子系统间接口 │ │ └── js # 资源管理JavaScript接口 ``` diff --git a/bundle.json b/bundle.json index 4b2bda1..13aa3fe 100644 --- a/bundle.json +++ b/bundle.json @@ -63,7 +63,7 @@ "inner_kits": [ { "header": { - "header_base": "//base/global/resource_management/interfaces/innerkits/include/", + "header_base": "//base/global/resource_management/interfaces/inner_api/include/", "header_files": [ "res_common.h", "res_config.h", diff --git a/frameworks/resmgr/BUILD.gn b/frameworks/resmgr/BUILD.gn index c3c4992..27d4942 100644 --- a/frameworks/resmgr/BUILD.gn +++ b/frameworks/resmgr/BUILD.gn @@ -18,7 +18,7 @@ config("resmgr_config") { include_dirs = [ "include", "//third_party/zlib/contrib/minizip", - "//base/global/resource_management/interfaces/innerkits/include", + "//base/global/resource_management/interfaces/inner_api/include", "//third_party/bounds_checking_function/include", ] @@ -50,7 +50,7 @@ config("resmgr_public_config") { visibility = [ ":*" ] include_dirs = - [ "//base/global/resource_management/interfaces/innerkits/include" ] + [ "//base/global/resource_management/interfaces/inner_api/include" ] if (resource_management_support_icu) { include_dirs += [ "//third_party/icu/icu4c/source/common" ] @@ -169,7 +169,7 @@ ohos_shared_library("librawfile") { include_dirs = [ "//base/global/resource_management/frameworks/resmgr/include", "//base/global/resource_management/interfaces/native/resource/include", - "//base/global/resource_management/interfaces/innerkits/include", + "//base/global/resource_management/interfaces/inner_api/include", "//base/global/resource_management/interfaces/js/innerkits/core/include", "//third_party/node/src", ] diff --git a/frameworks/resmgr/test/BUILD.gn b/frameworks/resmgr/test/BUILD.gn index 786f580..5e6e1c5 100644 --- a/frameworks/resmgr/test/BUILD.gn +++ b/frameworks/resmgr/test/BUILD.gn @@ -36,7 +36,7 @@ ohos_unittest("resmgr_test") { include_dirs = [ "unittest/common", "//base/global/resource_management/frameworks/resmgr/include", - "//base/global/resource_management/interfaces/innerkits/include", + "//base/global/resource_management/interfaces/inner_api/include", ] if (resource_management_support_icu) { diff --git a/interfaces/innerkits/include/res_common.h b/interfaces/inner_api/include/res_common.h similarity index 100% rename from interfaces/innerkits/include/res_common.h rename to interfaces/inner_api/include/res_common.h diff --git a/interfaces/innerkits/include/res_config.h b/interfaces/inner_api/include/res_config.h similarity index 100% rename from interfaces/innerkits/include/res_config.h rename to interfaces/inner_api/include/res_config.h diff --git a/interfaces/innerkits/include/resource_manager.h b/interfaces/inner_api/include/resource_manager.h similarity index 100% rename from interfaces/innerkits/include/resource_manager.h rename to interfaces/inner_api/include/resource_manager.h diff --git a/interfaces/innerkits/include/rstate.h b/interfaces/inner_api/include/rstate.h similarity index 100% rename from interfaces/innerkits/include/rstate.h rename to interfaces/inner_api/include/rstate.h diff --git a/interfaces/js/kits/BUILD.gn b/interfaces/js/kits/BUILD.gn index 3165851..d390ce8 100644 --- a/interfaces/js/kits/BUILD.gn +++ b/interfaces/js/kits/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") ohos_shared_library("resourcemanager") { include_dirs = [ - "//base/global/resource_management/interfaces/innerkits/include", + "//base/global/resource_management/interfaces/inner_api/include", "//base/hiviewdfx/interfaces/native/innerkits/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context", "//third_party/node/src",