From 72a0abf7426bb15ba3b4df0f749fd6c15fd13dd9 Mon Sep 17 00:00:00 2001 From: linxiangzhi Date: Thu, 12 May 2022 17:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=90=86=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E3=80=81=E4=BB=93=E5=90=8D=E5=92=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: linxiangzhi Change-Id: I4ecb8d80e74a64f5af85c71b3e4de234a3652973 --- README_zh.md | 2 +- appexecfwk.gni | 2 +- bundle.json | 16 ++++++++-------- bundle_tool/bundle.json | 10 +++++----- bundle_tool/bundletool.gni | 2 +- distributed_bundle_framework/bundle.json | 6 +++--- libs/libeventhandler/bundle.json | 20 ++++++++++---------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README_zh.md b/README_zh.md index c94cab15..bf3d0f35 100644 --- a/README_zh.md +++ b/README_zh.md @@ -27,7 +27,7 @@ ## 目录 ``` -foundation/appexecfwk/standard +foundation/bundlemanager/bundle_framework ├── kits │   └── appkit # Appkit实现的核心代码 ├── common diff --git a/appexecfwk.gni b/appexecfwk.gni index 020c7e87..9d6012b7 100644 --- a/appexecfwk.gni +++ b/appexecfwk.gni @@ -12,7 +12,7 @@ # limitations under the License. aafwk_path = "//foundation/aafwk/standard" -appexecfwk_path = "//foundation/appexecfwk/standard" +appexecfwk_path = "//foundation/bundlemanager/bundle_framework" libs_path = "${appexecfwk_path}/libs" common_path = "${appexecfwk_path}/common" diff --git a/bundle.json b/bundle.json index 857819a1..fa36eaaf 100644 --- a/bundle.json +++ b/bundle.json @@ -4,7 +4,7 @@ "version": "3.1", "license": "Apache 2.0", "segment": { - "destPath": "foundation/appexecfwk/standard" + "destPath": "foundation/bundlemanager/bundle_framework" }, "component": { "name": "bundle_framework", @@ -18,7 +18,7 @@ "bundle_framework_free_install" ], "hisysevent_config": [ - "//foundation/appexecfwk/standard/hisysevent.yaml" + "//foundation/bundlemanager/bundle_framework/hisysevent.yaml" ], "adapted_system_type": [ "standard" @@ -58,12 +58,12 @@ }, "build": { "sub_component": [ - "//foundation/appexecfwk/standard:bms_target" + "//foundation/bundlemanager/bundle_framework:bms_target" ], "inner_kits": [ { "header": { - "header_base": "//foundation/appexecfwk/standard/interfaces/inner_api/appexecfwk_base/include", + "header_base": "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", "header_files": [ "ability_info.h", "appexecfwk_errors.h", @@ -71,11 +71,11 @@ "bundle_info.h" ] }, - "name": "//foundation/appexecfwk/standard/interfaces/inner_api/appexecfwk_base:appexecfwk_base" + "name": "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base:appexecfwk_base" }, { "header": { - "header_base": "//foundation/appexecfwk/standard/interfaces/inner_api/appexecfwk_core/include", + "header_base": "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include", "header_files": [ "bundlemgr/bundle_installer_interface.h", "bundlemgr/bundle_mgr_interface.h", @@ -84,11 +84,11 @@ "bundlemgr/status_receiver_interface.h" ] }, - "name": "//foundation/appexecfwk/standard/interfaces/inner_api/appexecfwk_core:appexecfwk_core" + "name": "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core:appexecfwk_core" } ], "test": [ - "//foundation/appexecfwk/standard:test_target" + "//foundation/bundlemanager/bundle_framework:test_target" ] } } diff --git a/bundle_tool/bundle.json b/bundle_tool/bundle.json index 789a82e0..8b14ce73 100644 --- a/bundle_tool/bundle.json +++ b/bundle_tool/bundle.json @@ -4,7 +4,7 @@ "version": "3.1", "license": "Apache 2.0", "segment": { - "destPath": "foundation/appexecfwk/standard/bundle_tool" + "destPath": "foundation/bundlemanager/bundle_framework/bundle_tool" }, "component": { "name": "bundle_tool", @@ -32,13 +32,13 @@ }, "build": { "sub_component": [ - "//foundation/appexecfwk/standard/bundle_tool:bm" + "//foundation/bundlemanager/bundle_framework/bundle_tool:bm" ], "inner_kits": [], "test": [ - "//foundation/appexecfwk/standard/bundle_tool/test:moduletest", - "//foundation/appexecfwk/standard/bundle_tool/test:systemtest", - "//foundation/appexecfwk/standard/bundle_tool/test:unittest" + "//foundation/bundlemanager/bundle_framework/bundle_tool/test:moduletest", + "//foundation/bundlemanager/bundle_framework/bundle_tool/test:systemtest", + "//foundation/bundlemanager/bundle_framework/bundle_tool/test:unittest" ] } } diff --git a/bundle_tool/bundletool.gni b/bundle_tool/bundletool.gni index 34c5372d..2113a5de 100644 --- a/bundle_tool/bundletool.gni +++ b/bundle_tool/bundletool.gni @@ -12,7 +12,7 @@ # limitations under the License. aafwk_path = "//foundation/aafwk/standard" -appexecfwk_path = "//foundation/appexecfwk/standard" +appexecfwk_path = "//foundation/bundlemanager/bundle_framework" common_path = "${appexecfwk_path}/common" kits_path = "${appexecfwk_path}/interfaces/kits" diff --git a/distributed_bundle_framework/bundle.json b/distributed_bundle_framework/bundle.json index 95f9b8de..ad6562ce 100644 --- a/distributed_bundle_framework/bundle.json +++ b/distributed_bundle_framework/bundle.json @@ -4,7 +4,7 @@ "version": "3.1", "license": "Apache 2.0", "segment": { - "destPath": "foundation/appexecfwk/standard/distributed_bundle_framework" + "destPath": "foundation/bundlemanager/bundle_framework/distributed_bundle_framework" }, "component": { "name": "distributed_bundle_framework", @@ -38,8 +38,8 @@ }, "build": { "sub_component": [ - "//foundation/appexecfwk/standard/distributed_bundle_framework:jsapi_target", - "//foundation/appexecfwk/standard/distributed_bundle_framework:dbms_target" + "//foundation/bundlemanager/bundle_framework/distributed_bundle_framework:jsapi_target", + "//foundation/bundlemanager/bundle_framework/distributed_bundle_framework:dbms_target" ], "test": [] } diff --git a/libs/libeventhandler/bundle.json b/libs/libeventhandler/bundle.json index 4f449195..7513be3e 100644 --- a/libs/libeventhandler/bundle.json +++ b/libs/libeventhandler/bundle.json @@ -4,7 +4,7 @@ "version": "3.1", "license": "Apache 2.0", "segment": { - "destPath": "foundation/appexecfwk/standard/libs/libeventhandler" + "destPath": "foundation/bundlemanager/bundle_framework/libs/libeventhandler" }, "component": { "name": "eventhandler", @@ -28,13 +28,13 @@ }, "build": { "sub_component": [ - "//foundation/appexecfwk/standard/interfaces/innerkits:innerkits_target", - "//foundation/appexecfwk/standard/interfaces/innerkits/napi:napi_packages" + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits:innerkits_target", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/napi:napi_packages" ], "inner_kits": [ { "header": { - "header_base": "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", + "header_base": "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler/include", "header_files": [ "event_handler_errors.h", "event_handler.h", @@ -45,22 +45,22 @@ "native_implement_eventhandler.h" ] }, - "name": "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler" + "name": "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler" }, { "header": { - "header_base": "//foundation/appexecfwk/standard/interfaces/innerkits/eventhandler_native/eventhandler", + "header_base": "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/eventhandler_native/eventhandler", "header_files": [ "native_interface_eventhandler.h" ] }, - "name": "//foundation/appexecfwk/standard/interfaces/innerkits/eventhandler_native:eventhandler_native" + "name": "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/eventhandler_native:eventhandler_native" } ], "test": [ - "//foundation/appexecfwk/standard/libs/libeventhandler/test:unittest", - "//foundation/appexecfwk/standard/libs/test:moduletest", - "//foundation/appexecfwk/standard/test/systemtest/common/ems:systemtest_ems" + "//foundation/bundlemanager/bundle_framework/libs/libeventhandler/test:unittest", + "//foundation/bundlemanager/bundle_framework/libs/test:moduletest", + "//foundation/bundlemanager/bundle_framework/test/systemtest/common/ems:systemtest_ems" ] } }