From b10a35145434e93fcac1cd6623021062ab6b566d Mon Sep 17 00:00:00 2001 From: Lotol Date: Fri, 5 May 2023 01:04:15 +0000 Subject: [PATCH] =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lotol Change-Id: I7fc73fad700594278e40ea823abb97300e56f343 --- frameworks/bundle_lite/BUILD.gn | 24 -------- .../kits/bundle_lite/js/builtin/BUILD.gn | 6 -- services/bundlemgr_lite/BUILD.gn | 58 +------------------ .../bundlemgr_lite/bundle_daemon/BUILD.gn | 14 +---- services/bundlemgr_lite/tools/BUILD.gn | 19 +----- 5 files changed, 4 insertions(+), 117 deletions(-) diff --git a/frameworks/bundle_lite/BUILD.gn b/frameworks/bundle_lite/BUILD.gn index 6999eec..1f9a32b 100644 --- a/frameworks/bundle_lite/BUILD.gn +++ b/frameworks/bundle_lite/BUILD.gn @@ -15,10 +15,6 @@ import("//build/lite/ndk/ndk.gni") generate_notice_file("bundle_notice_file") { module_name = "bundle" - module_source_dir_list = [ - "//third_party/bounds_checking_function", - "//third_party/cJSON", - ] } lite_component("appexecfwk_kits_lite") { @@ -44,7 +40,6 @@ lite_library("bundle") { public_deps = [ "${aafwk_lite_path}/frameworks/want_lite:want", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", ] include_dirs = [ @@ -55,19 +50,10 @@ lite_library("bundle") { "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", - "//base/security/permission_lite/interfaces/kits", - "//base/security/permission_lite/services/pms/include", "${aafwk_lite_path}/frameworks/want_lite/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//third_party/bounds_checking_function/include", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", - "//third_party/cJSON", ] } else { target_type = "shared_library" @@ -90,26 +76,16 @@ lite_library("bundle") { deps = [ "${aafwk_lite_path}/frameworks/want_lite:want", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/security/permission_lite/services/pms_client:pms_client", ] include_dirs = [ "include", - "//base/security/permission_lite/interfaces/kits", - "//base/security/permission_lite/services/pms/include", "${aafwk_lite_path}/frameworks/want_lite/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_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", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//third_party/bounds_checking_function/include", - "//commonlibrary/utils_lite/include", - "//third_party/cJSON", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] diff --git a/interfaces/kits/bundle_lite/js/builtin/BUILD.gn b/interfaces/kits/bundle_lite/js/builtin/BUILD.gn index f53ef4f..f214c62 100644 --- a/interfaces/kits/bundle_lite/js/builtin/BUILD.gn +++ b/interfaces/kits/bundle_lite/js/builtin/BUILD.gn @@ -15,10 +15,7 @@ import("//build/lite/ndk/ndk.gni") static_library("capability_api_simulator") { sources = [ "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin/src/capability_module.cpp" ] include_dirs = [ - "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", - "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", ] @@ -33,10 +30,7 @@ shared_library("capability_api") { cflags += [ "-Wall" ] cflags_cc = cflags include_dirs = [ - "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", - "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "${aafwk_lite_path}/interfaces/kits/want_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", ] diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 3fb0ae6..4925799 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -45,15 +45,7 @@ if (ohos_kernel_type == "liteos_m") { ] } - deps = [ - "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/global/resource_management_lite/frameworks/resmgr_lite:global_resmgr", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", - "//build/lite/config/component/cJSON:cjson_static", - "//foundation/arkui/ace_engine_lite/frameworks:ace_lite", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - "//third_party/jerryscript/jerry-core:jerry-core_static", - ] + deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle" ] include_dirs = [ "${appexecfwk_lite_path}/services/bundlemgr_lite/include", @@ -63,33 +55,12 @@ 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/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", - "//base/startup/init/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/kits/ability_lite/slite", "${aafwk_lite_path}/services/abilitymgr_lite/include", "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/frameworks/want_lite/include", - "//base/global/resource_management_lite/interfaces/inner_api/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", - "//third_party/jerryscript/jerry-core", - "//third_party/jerryscript/jerry-core/api", - "//third_party/jerryscript/jerry-core/ecma/base", - "//third_party/jerryscript/jerry-core/include", - "//third_party/jerryscript/jerry-core/jrt", - "//third_party/jerryscript/jerry-core/jmem", - "//third_party/jerryscript/jerry-core/lit", - "//third_party/cJSON", - "//third_party/zlib", - "//third_party/zlib/contrib/minizip", - "//base/security/permission_lite/interfaces/kits", - "//base/security/permission_lite/services/pms/include", - "//base/security/appverify/interfaces/innerkits/appverify_lite/include", - "//third_party/bounds_checking_function/include", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory/include", "include", ] } @@ -126,7 +97,6 @@ if (ohos_kernel_type == "liteos_m") { "src/zip_file.cpp", ] include_dirs = [ - "//base/global/resource_management_lite/interfaces/inner_api/include", "${aafwk_lite_path}/services/abilitymgr_lite/include", "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite", @@ -136,29 +106,10 @@ if (ohos_kernel_type == "liteos_m") { "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", - "//third_party/cJSON", - "//third_party/zlib", - "//third_party/zlib/contrib/minizip", - "//base/security/permission_lite/interfaces/kits", - "//base/security/permission_lite/services/pms/include", - "//base/security/appverify/interfaces/innerkits/appverify_lite/include", - "//third_party/bounds_checking_function/include", - "//commonlibrary/utils_lite/include", - "//commonlibrary/utils_lite/memory", "include", ] - public_deps = [ - "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/global/resource_management_lite/frameworks/resmgr_lite:global_resmgr", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/security/appverify/interfaces/innerkits/appverify_lite:verify", - "//build/lite/config/component/cJSON:cjson_shared", - "//build/lite/config/component/zlib:zlib_shared", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - ] + public_deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle" ] } lite_component("appexecfwk_services_lite") { features = [ @@ -171,9 +122,4 @@ if (ohos_kernel_type == "liteos_m") { generate_notice_file("appexecfwk_services_lite_notice_file") { module_name = "appexecfwk_services_lite" - module_source_dir_list = [ - "//third_party/cJSON", - "//third_party/zlib", - "//third_party/bounds_checking_function", - ] } diff --git a/services/bundlemgr_lite/bundle_daemon/BUILD.gn b/services/bundlemgr_lite/bundle_daemon/BUILD.gn index 4c2c311..0e340be 100755 --- a/services/bundlemgr_lite/bundle_daemon/BUILD.gn +++ b/services/bundlemgr_lite/bundle_daemon/BUILD.gn @@ -14,10 +14,6 @@ import("//build/lite/config/component/lite_component.gni") generate_notice_file("bundle_daemon_lite_notice_file") { module_name = "bundle_daemon_lite" - module_source_dir_list = [ - "//third_party/cJSON", - "//third_party/zlib", - ] } executable("bundle_daemon") { @@ -42,20 +38,12 @@ executable("bundle_daemon") { "-Wl,-Map=bundle_daemon_tool.map", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//build/lite/config/component/zlib:zlib_shared", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - ] + deps = [] include_dirs = [ "include", "${appexecfwk_lite_path}/interfaces/inner_api/bundlemgr_lite", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/services/bundlemgr_lite/include", - "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", - "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", - "//third_party/zlib/contrib/minizip", - "//commonlibrary/utils_lite/include", ] } diff --git a/services/bundlemgr_lite/tools/BUILD.gn b/services/bundlemgr_lite/tools/BUILD.gn index 7a38c7a..effd2e9 100644 --- a/services/bundlemgr_lite/tools/BUILD.gn +++ b/services/bundlemgr_lite/tools/BUILD.gn @@ -14,7 +14,6 @@ import("//build/lite/config/component/lite_component.gni") generate_notice_file("bm_notice_file") { module_name = "bm" - module_source_dir_list = [ "//third_party/cJSON" ] } executable("bm") { @@ -35,21 +34,10 @@ executable("bm") { "-Wl,-Map=bm_tool.map", ] - deps = [ - "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/security/permission_lite/services/pms_client:pms_client", - "//base/startup/init/interfaces/innerkits:libbegetutil", - "//build/lite/config/component/cJSON:cjson_shared", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - ] + deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle" ] include_dirs = [ "include", - "//base/security/permission_lite/services/pms_client/include", - "//base/security/permission_lite/interfaces/innerkits", - "//base/startup/init/interfaces/innerkits/include/syspara", "${aafwk_lite_path}/interfaces/inner_api/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/want_lite", "${aafwk_lite_path}/services/abilitymgr_lite/include", @@ -57,11 +45,6 @@ executable("bm") { "${appexecfwk_lite_path}/frameworks/bundle_lite/include", "${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", - "//third_party/cJSON", - "//commonlibrary/utils_lite/include", - "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", ] defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] -- Gitee