From 71f9f09ce1330e5f36c0daa1d5caa626c4175d71 Mon Sep 17 00:00:00 2001 From: Tombaugh Date: Tue, 5 Dec 2023 17:17:58 +0800 Subject: [PATCH 1/2] weak dependence of hichecker Signed-off-by: Tombaugh Change-Id: I9e5bd46c12891c79172ab5753920d2d1e94a71da --- frameworks/kits/js/common/image_napi_utils.cpp | 4 ++-- interfaces/kits/js/common/BUILD.gn | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frameworks/kits/js/common/image_napi_utils.cpp b/frameworks/kits/js/common/image_napi_utils.cpp index 76d94fe12..efb61fb01 100644 --- a/frameworks/kits/js/common/image_napi_utils.cpp +++ b/frameworks/kits/js/common/image_napi_utils.cpp @@ -16,7 +16,7 @@ #include "image_napi_utils.h" #include #include -#if !defined(IOS_PLATFORM) && !defined(A_PLATFORM) +#if !defined(IOS_PLATFORM) && !defined(A_PLATFORM) && defined(HICHECKER_ENABLE) #include "hichecker.h" #endif @@ -118,7 +118,7 @@ napi_valuetype ImageNapiUtils::getType(napi_env env, napi_value root) void ImageNapiUtils::HicheckerReport() { -#if !defined(IOS_PLATFORM) && !defined(A_PLATFORM) +#if !defined(IOS_PLATFORM) && !defined(A_PLATFORM) && defined(HICHECKER_ENABLE) uint32_t pid = getpid(); uint32_t tid = gettid(); std::string cautionMsg = "Trigger: pid = " + std::to_string(pid) + ", tid = " + std::to_string(tid); diff --git a/interfaces/kits/js/common/BUILD.gn b/interfaces/kits/js/common/BUILD.gn index 1f826a0c4..8766aa1ff 100644 --- a/interfaces/kits/js/common/BUILD.gn +++ b/interfaces/kits/js/common/BUILD.gn @@ -232,6 +232,7 @@ if (use_clang_ios) { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] } else { + defines = [] deps = [ "$image_subsystem/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", "$image_subsystem/frameworks/innerkitsimpl/utils:image_utils", @@ -244,11 +245,16 @@ if (use_clang_ios) { "graphic_2d:color_manager", "graphic_2d:color_space_object_convertor", "graphic_2d:surface", - "hichecker:libhichecker", "hitrace:hitrace_meter", "ipc:ipc_napi_common", "napi:ace_napi", ] + + if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hichecker)) { + external_deps += [ "hichecker:libhichecker" ] + defines += [ "HICHECKER_ENABLE" ] + } + deps += [ "//third_party/libpng:png_static" ] output_name = "libimage_napi" subsystem_name = "multimedia" @@ -282,9 +288,14 @@ if (use_clang_ios) { external_deps = [ "c_utils:utils", - "hichecker:libhichecker", "hitrace:hitrace_meter", ] + + if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hichecker)) { + external_deps += [ "hichecker:libhichecker" ] + defines += [ "HICHECKER_ENABLE" ] + } + relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "image_framework" -- Gitee From 4558c1c173fc5df58404c484566ca272f8c4a0b9 Mon Sep 17 00:00:00 2001 From: Tombaugh Date: Tue, 5 Dec 2023 19:10:54 +0800 Subject: [PATCH 2/2] fix gn format Signed-off-by: Tombaugh Change-Id: I3a040126f42d8c70d15107c49685a860c0fa1972 --- interfaces/kits/js/common/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/js/common/BUILD.gn b/interfaces/kits/js/common/BUILD.gn index 8766aa1ff..6439ac1bf 100644 --- a/interfaces/kits/js/common/BUILD.gn +++ b/interfaces/kits/js/common/BUILD.gn @@ -250,7 +250,8 @@ if (use_clang_ios) { "napi:ace_napi", ] - if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hichecker)) { + if (defined(global_parts_info) && + defined(global_parts_info.hiviewdfx_hichecker)) { external_deps += [ "hichecker:libhichecker" ] defines += [ "HICHECKER_ENABLE" ] } @@ -291,7 +292,8 @@ if (use_clang_ios) { "hitrace:hitrace_meter", ] - if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hichecker)) { + if (defined(global_parts_info) && + defined(global_parts_info.hiviewdfx_hichecker)) { external_deps += [ "hichecker:libhichecker" ] defines += [ "HICHECKER_ENABLE" ] } -- Gitee