From 4898fd0b03d9317212413c032ee648558fc9f066 Mon Sep 17 00:00:00 2001 From: lifumin Date: Wed, 13 Aug 2025 09:52:04 +0800 Subject: [PATCH] lifumin3@h-partners.com Signed-off-by: lifumin --- BUILD.gn | 18 ++++-------------- bundle.json | 5 +---- libexif/huawei/mnote-huawei-entry.c | 12 +----------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 0261ed4..e5b8b30 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -94,14 +94,9 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera part_name = "libexif" # arkui-x not supported external_deps if (is_arkui_x) { - deps = [ - "//third_party/bounds_checking_function:libsec_static", - "//vendor/huawei/base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog"] + deps = [ "//third_party/bounds_checking_function:libsec_static" ] } else { - external_deps = [ - "bounds_checking_function:libsec_shared", - "hilog:libhilog" - ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } branch_protector_ret = "pac_ret" sources = [ @@ -158,14 +153,9 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera branch_protector_ret = "pac_ret" deps = [ ":exif_static" ] if (is_arkui_x) { - deps += [ - "//third_party/bounds_checking_function:libsec_static", - "//vendor/huawei/base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog"] + deps += [ "//third_party/bounds_checking_function:libsec_static" ] } else { - external_deps = [ - "bounds_checking_function:libsec_shared", - "hilog:libhilog" - ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } public_configs = [ ":build_public_config" ] install_images = [ system_base_dir ] diff --git a/bundle.json b/bundle.json index bdcf816..4bd474e 100644 --- a/bundle.json +++ b/bundle.json @@ -22,10 +22,7 @@ "rom": "196KB", "ram": "392KB", "deps": { - "components": [ - "bounds_checking_function", - "hilog" - ], + "components": [ "bounds_checking_function" ], "third_party": [] }, "build": { diff --git a/libexif/huawei/mnote-huawei-entry.c b/libexif/huawei/mnote-huawei-entry.c index b93e525..d6ec3d9 100644 --- a/libexif/huawei/mnote-huawei-entry.c +++ b/libexif/huawei/mnote-huawei-entry.c @@ -17,24 +17,19 @@ #include "exif-mnote-data-huawei.h" #include "mnote-huawei-entry.h" #include "mnote-huawei-tag.h" -#include "hilog/log.h" #include #include #include #include #include +#include #include #include #include #include -#undef LOG_DOMAIN -#define LOG_DOMAIN 0xD002B60 -#undef LOG_TAG -#define LOG_TAG "mnote-huawei-entry" - #define DATA_LENGTH 1024 #define BLANK_SIZE 1 #define NEGATIVE_SIGN_SIZE 1 @@ -123,7 +118,6 @@ format_exif_components(MnoteHuaweiEntry *e, char *v, unsigned int maxlen, unsign } if (returnSize < 0) { - HILOG_INFO(LOG_CORE, "Do %{public}s snprintf_s fail", __func__); return NULL; } write_pos += (unsigned int)returnSize; @@ -325,8 +319,6 @@ mnote_huawei_entry_rational_process(char *buff, const int buff_size, const char } *(pv + strlen) = 0; if (EOK != memcpy_s(pv, strlen + 1, v, strlen)) { - HILOG_INFO(LOG_CORE, - "memcpy failed at %{public}s, strlen:%{public}d, strlen:%{public}s", __func__, strlen, v); ret = -1; goto FINISH; } @@ -417,8 +409,6 @@ mnote_huawei_entry_value_process(char *buff, const int buff_size, const char *v, } *(pv + strlen) = 0; if (EOK != memcpy_s(pv, strlen + 1, v, strlen)) { - HILOG_INFO(LOG_CORE, - "memcpy failed at %{public}s, strlen:%{public}d, strlen:%{public}s", __func__, strlen, v); ret = -1; goto FINISH; } -- Gitee