From 4dbf2614dd637cff64958779ac9fb87930e5ec05 Mon Sep 17 00:00:00 2001 From: zhuofan0129 <861080528@qq.com> Date: Sat, 25 May 2024 11:02:40 +0800 Subject: [PATCH] feat: add adapted system type Signed-off-by: zhuofan0129 <861080528@qq.com> --- baselib/utils/BUILD.gn | 3 +-- bundle.json | 19 ++++++++++++------- oem_property/common/BUILD.gn | 3 +-- services/common/BUILD.gn | 3 +-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/baselib/utils/BUILD.gn b/baselib/utils/BUILD.gn index 3fbefa5..4630a26 100644 --- a/baselib/utils/BUILD.gn +++ b/baselib/utils/BUILD.gn @@ -76,9 +76,8 @@ ohos_static_library("utils_static") { sources += [ "src/utils_timer.cpp" ] - deps += [ "//third_party/cJSON:cjson" ] - external_deps = [ + "cJSON:cjson", "c_utils:utils", "hilog:libhilog", ] diff --git a/bundle.json b/bundle.json index cba9724..64e4183 100644 --- a/bundle.json +++ b/bundle.json @@ -17,17 +17,24 @@ "syscap": [ "SystemCapability.Security.DeviceSecurityLevel" ], - "features": [], + "features": [ + "device_security_level_feature_cred_level", + "device_security_level_feature_plugin_path", + "device_security_level_feature_secondary_session_name" + ], "hisysevent_config": [ "//base/security/device_security_level/hisysevent.yaml" ], "adapted_system_type": [ - "standard" + "standard", + "small", + "mini" ], "rom": "200KB", "ram": "2500KB", "deps": { "components": [ + "cJSON", "c_utils", "device_auth", "device_manager", @@ -39,12 +46,10 @@ "init", "ipc", "safwk", - "samgr" - ], - "third_party": [ - "cJSON", + "samgr", "openssl" - ] + ], + "third_party": [ "openssl" ] }, "build": { "group_type": { diff --git a/oem_property/common/BUILD.gn b/oem_property/common/BUILD.gn index 6aafa0e..184f1b0 100644 --- a/oem_property/common/BUILD.gn +++ b/oem_property/common/BUILD.gn @@ -47,11 +47,10 @@ ohos_source_set("oem_common_obj") { } branch_protector_ret = "pac_ret" - deps += [ "//third_party/openssl:libcrypto_shared" ] - external_deps = [ "c_utils:utils", "hilog:libhilog", + "openssl:libcrypto_shared", ] } configs = [ diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index f663130..b41a1aa 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -52,12 +52,11 @@ ohos_source_set("service_common_obj") { } branch_protector_ret = "pac_ret" - deps += [ "//third_party/openssl:libcrypto_shared" ] - external_deps = [ "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", + "openssl:libcrypto_shared", ] } -- Gitee