From fdfe9ba10f8a5e6609a49e629f09c8fb3d6d9068 Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Thu, 9 May 2024 19:48:47 +0800 Subject: [PATCH 1/2] Signed-off-by:hanqiaosheng --- base/BUILD.gn | 29 +++++++++++++++++++++++++++++ bundle.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn index e9b037c..36eefb7 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -124,6 +124,35 @@ ohos_static_library("utilsbase") { } } +ohos_static_library("utilsbase_static") { + if (current_os == "ios") { + sources = sources_utils_ios + configs = [ ":utils_coverage_config" ] + public_configs = [ ":utils_config" ] + + public_external_deps = [ "bounds_checking_function:libsec_static" ] + defines = [ "IOS_PLATFORM" ] + + subsystem_name = "commonlibrary" + part_name = "c_utils" + } else { + sources = sources_utils + configs = [ ":utils_coverage_config" ] + public_configs = [ ":utils_config" ] + if (current_os != "android" && current_os != "ios") { + defines = [ "CONFIG_HILOG" ] + } + if (c_utils_debug_log_enabled) { + configs += [ ":debug_log_enabled" ] + } + external_deps = [ "hilog:libhilog_base_static" ] + + public_external_deps = [ "bounds_checking_function:libsec_static" ] + subsystem_name = "commonlibrary" + part_name = "c_utils" + } +} + ohos_static_library("utilsbase_rtti") { visibility = [ "//foundation/multimedia/media_foundation/engine/plugin/plugins/source/video_capture:std_video_capture" ] sources = sources_utils diff --git a/bundle.json b/bundle.json index 1319fcc..76f36f0 100644 --- a/bundle.json +++ b/bundle.json @@ -101,6 +101,39 @@ "header_base": "//commonlibrary/c_utils/base/include" } }, + { + "name": "//commonlibrary/c_utils/base:utilsbase_static", + "header": { + "header_files": [ + "ashmem.h", + "common_errors.h", + "common_timer_errors.h", + "datetime_ex.h", + "directory_ex.h", + "errors.h", + "file_ex.h", + "flat_obj.h", + "nocopyable.h", + "observer.h", + "parcel.h", + "pubdef.h", + "refbase.h", + "rwlock.h", + "safe_block_queue.h", + "safe_map.h", + "safe_queue.h", + "semaphore_ex.h", + "singleton.h", + "sorted_vector.h", + "string_ex.h", + "thread_ex.h", + "thread_pool.h", + "timer.h", + "unique_fd.h" + ], + "header_base": "//commonlibrary/c_utils/base/include" + } + }, { "name": "//commonlibrary/c_utils/base:utils_rust", "header": { -- Gitee From ac8db4fbacaa433eeeaf52ed060339aef2762009 Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Fri, 10 May 2024 17:21:40 +0800 Subject: [PATCH 2/2] Signed-off-by:hanqiaosheng --- base/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/base/BUILD.gn b/base/BUILD.gn index 36eefb7..c39c17b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -124,6 +124,7 @@ ohos_static_library("utilsbase") { } } +# for updater_binary, utilsbase_static link static libhilog_base_static ohos_static_library("utilsbase_static") { if (current_os == "ios") { sources = sources_utils_ios -- Gitee