From b21f4a07c85f39e172a2f00e5126927fc27b5d37 Mon Sep 17 00:00:00 2001 From: txzhang94 Date: Tue, 12 Mar 2024 01:10:44 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E5=8E=BB=E9=99=A4=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E4=BF=A1=E6=81=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4a79dfcaa70450c9271b5aca722fbdb5da18cf01. --- base/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn index 74128f6..8fa6a7d 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -102,6 +102,7 @@ ohos_static_library("utilsbase") { 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" ] @@ -120,6 +121,7 @@ ohos_static_library("utilsbase") { } external_deps = [ "hilog:libhilog_base" ] + #public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] public_external_deps = [ "bounds_checking_function:libsec_static" ] subsystem_name = "commonlibrary" part_name = "c_utils" @@ -136,6 +138,7 @@ ohos_static_library("utilsbase_rtti") { } external_deps = [ "hilog:libhilog_base" ] + #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" ] -- Gitee From bbab996ba90334f9a6a46c7fb8c2023fc8e0db16 Mon Sep 17 00:00:00 2001 From: txzhang94 Date: Tue, 12 Mar 2024 01:11:13 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E9=83=A8=E4=BB=B6=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E7=BC=96=E8=AF=91=E6=95=B4=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 07ee1feb45d39a19baf5445c11cb642112e3bcb5. --- base/BUILD.gn | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 8fa6a7d..c24ef50 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -99,11 +99,8 @@ ohos_static_library("utilsbase") { if (current_os == "ios") { 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" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] defines = [ "IOS_PLATFORM" ] subsystem_name = "commonlibrary" @@ -112,7 +109,6 @@ ohos_static_library("utilsbase") { 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" ] } @@ -120,9 +116,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" } @@ -132,14 +127,11 @@ 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" ] - 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_external_deps = [ "bounds_checking_function:libsec_static" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] remove_configs = [ "//build/config/compiler:no_rtti" ] cflags = [ "-frtti" ] subsystem_name = "commonlibrary" @@ -156,7 +148,7 @@ ohos_shared_library("utils") { sources = sources_utils_ios configs = [ ":utils_coverage_config" ] all_dependent_configs = [ ":utils_config" ] - public_external_deps = [ "bounds_checking_function:libsec_shared" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] defines = [ "IOS_PLATFORM" ] subsystem_name = "commonlibrary" @@ -193,7 +185,8 @@ ohos_shared_library("utils") { configs += [ ":debug_log_enabled" ] } external_deps = [ "hilog:libhilog_base" ] - public_external_deps = [ "bounds_checking_function:libsec_shared" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + subsystem_name = "commonlibrary" part_name = "c_utils" install_images = [ @@ -233,7 +226,8 @@ if (host_os == "linux" && !is_arkui_x) { ":cxx_rust_gen", "//third_party/rust/crates/cxx:cxx_cppdeps", ] - public_external_deps = [ "bounds_checking_function:libsec_shared" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + subsystem_name = "commonlibrary" part_name = "c_utils" } -- Gitee