From 334cac95ff17a8da118709dc22b52dba428abea8 Mon Sep 17 00:00:00 2001 From: lichao Date: Tue, 20 Feb 2024 16:18:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- base/BUILD.gn | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index c24ef50..03ab130 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -99,8 +99,9 @@ ohos_static_library("utilsbase") { if (current_os == "ios") { sources = sources_utils_ios configs = [ ":utils_coverage_config" ] - all_dependent_configs = [ ":utils_config" ] - public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] + public_configs = [ ":utils_config" ] + #public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] + public_external_deps = [ "bounds_checking_function:libsec_static" ] defines = [ "IOS_PLATFORM" ] subsystem_name = "commonlibrary" @@ -108,7 +109,7 @@ ohos_static_library("utilsbase") { } else { sources = sources_utils configs = [ ":utils_coverage_config" ] - all_dependent_configs = [ ":utils_config" ] + public_configs = [ ":utils_config" ] if (current_os != "android" && current_os != "ios") { defines = [ "CONFIG_HILOG" ] } @@ -116,8 +117,8 @@ ohos_static_library("utilsbase") { configs += [ ":debug_log_enabled" ] } external_deps = [ "hilog:libhilog_base" ] - public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] - + #public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] + public_external_deps = [ "bounds_checking_function:libsec_static" ] subsystem_name = "commonlibrary" part_name = "c_utils" } @@ -126,12 +127,14 @@ ohos_static_library("utilsbase") { ohos_static_library("utilsbase_rtti") { visibility = [ "//foundation/multimedia/media_foundation/engine/plugin/plugins/source/video_capture:std_video_capture" ] sources = sources_utils - all_dependent_configs = [ ":utils_config" ] + #all_dependent_configs = [ ":utils_config" ] + public_configs = [ ":utils_config" ] if (current_os != "android" && current_os != "ios") { defines = [ "CONFIG_HILOG" ] } external_deps = [ "hilog:libhilog_base" ] - public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] + #public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] + public_external_deps = [ "bounds_checking_function:libsec_static" ] remove_configs = [ "//build/config/compiler:no_rtti" ] cflags = [ "-frtti" ] subsystem_name = "commonlibrary" @@ -148,7 +151,7 @@ ohos_shared_library("utils") { sources = sources_utils_ios configs = [ ":utils_coverage_config" ] all_dependent_configs = [ ":utils_config" ] - public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + public_external_deps = [ "bounds_checking_function:libsec_shared" ] defines = [ "IOS_PLATFORM" ] subsystem_name = "commonlibrary" @@ -185,8 +188,7 @@ ohos_shared_library("utils") { configs += [ ":debug_log_enabled" ] } external_deps = [ "hilog:libhilog_base" ] - public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] - + public_external_deps = [ "bounds_checking_function:libsec_shared" ] subsystem_name = "commonlibrary" part_name = "c_utils" install_images = [ @@ -226,8 +228,7 @@ if (host_os == "linux" && !is_arkui_x) { ":cxx_rust_gen", "//third_party/rust/crates/cxx:cxx_cppdeps", ] - public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] - + public_external_deps = [ "bounds_checking_function:libsec_shared" ] subsystem_name = "commonlibrary" part_name = "c_utils" } -- Gitee From 63f9dd5de5451760a471a05790ac1725ba76ecee Mon Sep 17 00:00:00 2001 From: lichao Date: Sat, 24 Feb 2024 20:31:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E4=BF=AE=E6=94=B9---=20?= =?UTF-8?q?=E8=BF=98=E5=8E=9Fall=5Fdependent=5Fconfigs=EF=BC=8C=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- base/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 03ab130..657fc9a 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -100,6 +100,7 @@ ohos_static_library("utilsbase") { sources = sources_utils_ios configs = [ ":utils_coverage_config" ] public_configs = [ ":utils_config" ] + all_dependent_configs = [ ":utils_config" ] #public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] public_external_deps = [ "bounds_checking_function:libsec_static" ] defines = [ "IOS_PLATFORM" ] @@ -109,6 +110,7 @@ ohos_static_library("utilsbase") { } else { sources = sources_utils configs = [ ":utils_coverage_config" ] + all_dependent_configs = [ ":utils_config" ] public_configs = [ ":utils_config" ] if (current_os != "android" && current_os != "ios") { defines = [ "CONFIG_HILOG" ] @@ -127,7 +129,7 @@ ohos_static_library("utilsbase") { ohos_static_library("utilsbase_rtti") { visibility = [ "//foundation/multimedia/media_foundation/engine/plugin/plugins/source/video_capture:std_video_capture" ] sources = sources_utils - #all_dependent_configs = [ ":utils_config" ] + all_dependent_configs = [ ":utils_config" ] public_configs = [ ":utils_config" ] if (current_os != "android" && current_os != "ios") { defines = [ "CONFIG_HILOG" ] -- Gitee