From f6e1ced1d8f974f524ef0d59491bf560ba2e2b5d Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Mon, 13 Jun 2022 15:32:47 +0800 Subject: [PATCH] innerkits to inner_api Signed-off-by: changzheng6 --- bundle.json | 2 +- frameworks/bundle_lite/BUILD.gn | 6 +++--- interfaces/{innerkits => inner_api}/bundlemgr_lite/LICENSE | 0 .../{innerkits => inner_api}/bundlemgr_lite/README.md | 0 .../bundlemgr_lite/bundle_daemon_interface.h | 0 .../bundlemgr_lite/bundle_inner_interface.h | 0 .../bundlemgr_lite/bundle_service_interface.h | 0 .../bundlemgr_lite/slite/bundle_install_msg.h | 0 .../bundlemgr_lite/slite/bundle_manager_inner.h | 0 services/bundlemgr_lite/BUILD.gn | 6 +++--- services/bundlemgr_lite/bundle_daemon/BUILD.gn | 2 +- services/bundlemgr_lite/tools/BUILD.gn | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/LICENSE (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/README.md (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/bundle_daemon_interface.h (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/bundle_inner_interface.h (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/bundle_service_interface.h (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/slite/bundle_install_msg.h (100%) rename interfaces/{innerkits => inner_api}/bundlemgr_lite/slite/bundle_manager_inner.h (100%) diff --git a/bundle.json b/bundle.json index 4c31e9b..37176d6 100644 --- a/bundle.json +++ b/bundle.json @@ -44,7 +44,7 @@ "inner_kits": [ { "header": { - "header_base": "foundation/appexecfwk/appexecfwk_lite/interfaces/innerkits/bundlemgr_lite", + "header_base": "foundation/appexecfwk/appexecfwk_lite/interfaces/inner_api/bundlemgr_lite", "header_files": [ "bundle_daemon_interface.h", "bundle_inner_interface.h", diff --git a/frameworks/bundle_lite/BUILD.gn b/frameworks/bundle_lite/BUILD.gn index 2a1328e..bb9d388 100644 --- a/frameworks/bundle_lite/BUILD.gn +++ b/frameworks/bundle_lite/BUILD.gn @@ -49,8 +49,8 @@ lite_library("bundle") { include_dirs = [ "${appexecfwk_lite_path}/services/bundlemgr_lite/include", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/slite", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite/slite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/slite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", @@ -101,7 +101,7 @@ lite_library("bundle") { "${aafwk_lite_path}/frameworks/want_lite/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", diff --git a/interfaces/innerkits/bundlemgr_lite/LICENSE b/interfaces/inner_api/bundlemgr_lite/LICENSE similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/LICENSE rename to interfaces/inner_api/bundlemgr_lite/LICENSE diff --git a/interfaces/innerkits/bundlemgr_lite/README.md b/interfaces/inner_api/bundlemgr_lite/README.md similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/README.md rename to interfaces/inner_api/bundlemgr_lite/README.md diff --git a/interfaces/innerkits/bundlemgr_lite/bundle_daemon_interface.h b/interfaces/inner_api/bundlemgr_lite/bundle_daemon_interface.h similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/bundle_daemon_interface.h rename to interfaces/inner_api/bundlemgr_lite/bundle_daemon_interface.h diff --git a/interfaces/innerkits/bundlemgr_lite/bundle_inner_interface.h b/interfaces/inner_api/bundlemgr_lite/bundle_inner_interface.h similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/bundle_inner_interface.h rename to interfaces/inner_api/bundlemgr_lite/bundle_inner_interface.h diff --git a/interfaces/innerkits/bundlemgr_lite/bundle_service_interface.h b/interfaces/inner_api/bundlemgr_lite/bundle_service_interface.h similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/bundle_service_interface.h rename to interfaces/inner_api/bundlemgr_lite/bundle_service_interface.h diff --git a/interfaces/innerkits/bundlemgr_lite/slite/bundle_install_msg.h b/interfaces/inner_api/bundlemgr_lite/slite/bundle_install_msg.h similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/slite/bundle_install_msg.h rename to interfaces/inner_api/bundlemgr_lite/slite/bundle_install_msg.h diff --git a/interfaces/innerkits/bundlemgr_lite/slite/bundle_manager_inner.h b/interfaces/inner_api/bundlemgr_lite/slite/bundle_manager_inner.h similarity index 100% rename from interfaces/innerkits/bundlemgr_lite/slite/bundle_manager_inner.h rename to interfaces/inner_api/bundlemgr_lite/slite/bundle_manager_inner.h diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 9632fe9..e93f45c 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -39,8 +39,8 @@ if (ohos_kernel_type == "liteos_m") { include_dirs = [ "${appexecfwk_lite_path}/services/bundlemgr_lite/include", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/slite", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite/slite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/slite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", @@ -109,7 +109,7 @@ if (ohos_kernel_type == "liteos_m") { "${aafwk_lite_path}/interfaces/kits/ability_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/frameworks/want_lite/include", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", diff --git a/services/bundlemgr_lite/bundle_daemon/BUILD.gn b/services/bundlemgr_lite/bundle_daemon/BUILD.gn index adbebae..1cf32f3 100755 --- a/services/bundlemgr_lite/bundle_daemon/BUILD.gn +++ b/services/bundlemgr_lite/bundle_daemon/BUILD.gn @@ -50,7 +50,7 @@ executable("bundle_daemon") { include_dirs = [ "include", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/services/bundlemgr_lite/include", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", diff --git a/services/bundlemgr_lite/tools/BUILD.gn b/services/bundlemgr_lite/tools/BUILD.gn index a0a33ed..9995ca4 100644 --- a/services/bundlemgr_lite/tools/BUILD.gn +++ b/services/bundlemgr_lite/tools/BUILD.gn @@ -53,7 +53,7 @@ executable("bm") { "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/services/abilitymgr_lite/include", - "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/", + "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite/", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", -- Gitee