From 31b260febebeb07da0686bf971579d724672df3a Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Tue, 10 May 2022 18:27:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- services/bundlemgr_lite/BUILD.gn | 2 +- services/bundlemgr_lite/tools/BUILD.gn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index b2b7adc..0d86cff 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -45,7 +45,7 @@ if (ohos_kernel_type == "liteos_m") { "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//base/startup/syspara_lite/interfaces/kits/", + "//base/startup/init_lite/interfaces/innerkits/include/syspara/", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", "${aafwk_lite_path}/services/abilitymgr_lite/include", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", diff --git a/services/bundlemgr_lite/tools/BUILD.gn b/services/bundlemgr_lite/tools/BUILD.gn index 4c9d99a..f24cf99 100644 --- a/services/bundlemgr_lite/tools/BUILD.gn +++ b/services/bundlemgr_lite/tools/BUILD.gn @@ -38,7 +38,7 @@ executable("bm") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/syspara_lite/frameworks/parameter:parameter", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/security/permission/services/permission_lite/pms_client:pms_client", "//build/lite/config/component/cJSON:cjson_shared", "//foundation/communication/ipc_lite:liteipc_adapter", @@ -49,7 +49,7 @@ executable("bm") { "include", "//base/security/permission/services/permission_lite/pms_client/include", "//base/security/permission/interfaces/innerkits/permission_lite", - "//base/startup/syspara_lite/interfaces/kits", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/services/abilitymgr_lite/include", -- Gitee From d5e4cfca1200429f86ac87eaa3f5f83b2960e4ac Mon Sep 17 00:00:00 2001 From: Mupceet Date: Sun, 15 May 2022 13:48:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=BD=92=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- services/bundlemgr_lite/BUILD.gn | 2 +- services/bundlemgr_lite/tools/BUILD.gn | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index b00eb34..acb021a 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -45,7 +45,7 @@ if (ohos_kernel_type == "liteos_m") { "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara/", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", "${aafwk_lite_path}/services/abilitymgr_lite/include", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", diff --git a/services/bundlemgr_lite/tools/BUILD.gn b/services/bundlemgr_lite/tools/BUILD.gn index da57ae8..c244f4d 100644 --- a/services/bundlemgr_lite/tools/BUILD.gn +++ b/services/bundlemgr_lite/tools/BUILD.gn @@ -38,9 +38,8 @@ executable("bm") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/security/permission/services/permission_lite/pms_client:pms_client", - "//base/startup/syspara_lite/frameworks/parameter:parameter", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//build/lite/config/component/cJSON:cjson_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", -- Gitee From 647a5461ae0c5277f1da66ab00262f0f043b824f Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Thu, 23 Jun 2022 15:41:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- services/bundlemgr_lite/BUILD.gn | 1 - services/bundlemgr_lite/tools/BUILD.gn | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index acb021a..f0a0dd4 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -45,7 +45,6 @@ if (ohos_kernel_type == "liteos_m") { "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", "${aafwk_lite_path}/services/abilitymgr_lite/include", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", diff --git a/services/bundlemgr_lite/tools/BUILD.gn b/services/bundlemgr_lite/tools/BUILD.gn index c244f4d..2d2339b 100644 --- a/services/bundlemgr_lite/tools/BUILD.gn +++ b/services/bundlemgr_lite/tools/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") +import("//build/ohos.gni") generate_notice_file("bm_notice_file") { module_name = "bm" @@ -35,11 +36,11 @@ executable("bm") { "-Wl,-Map=bm_tool.map", ] + external_deps = [ "init_lite:libbegetutil" ] deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/permission/services/permission_lite/pms_client:pms_client", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//build/lite/config/component/cJSON:cjson_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", @@ -49,7 +50,6 @@ executable("bm") { "include", "//base/security/permission/services/permission_lite/pms_client/include", "//base/security/permission/interfaces/innerkits/permission_lite", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/services/abilitymgr_lite/include", -- Gitee