diff --git a/libpandabase/BUILD.gn b/libpandabase/BUILD.gn index e34d12a3bd..ef2e885be3 100644 --- a/libpandabase/BUILD.gn +++ b/libpandabase/BUILD.gn @@ -201,10 +201,12 @@ ohos_static_library("libarkbase_static") { deps = libarkbase_deps - if (!ark_standalone_build) { - public_external_deps = [ sdk_libc_secshared_dep ] - } else { + if (is_arkui_x) { + deps += [ "$ark_third_party_root/bounds_checking_function:libsec_static" ] + } else if (ark_standalone_build) { external_deps = [ sdk_libc_secshared_dep ] + } else { + public_external_deps = [ sdk_libc_secshared_dep ] } if (enable_hilog) { @@ -235,7 +237,11 @@ ohos_source_set("libarkbase_frontend_set_static") { deps = libarkbase_deps - external_deps = [ sdk_libc_secshared_dep ] + if (is_arkui_x) { + deps += [ "$ark_third_party_root/bounds_checking_function:libsec_static" ] + } else { + external_deps = [ sdk_libc_secshared_dep ] + } part_name = "runtime_core" subsystem_name = "arkcompiler" diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn index 042db54bf5..e17ea71232 100644 --- a/libpandafile/BUILD.gn +++ b/libpandafile/BUILD.gn @@ -106,14 +106,19 @@ ohos_static_library("libarkfile_static") { "$ark_root/libziparchive:libarkziparchive_static", ] - if (!ark_standalone_build) { - public_external_deps = [ - "zlib:libz", + if (is_arkui_x) { + deps += [ + "$ark_third_party_root/bounds_checking_function:libsec_static", + "$ark_third_party_root/zlib:libz", + ] + } else if (ark_standalone_build) { + external_deps = [ + "zlib:shared_libz", sdk_libc_secshared_dep, ] } else { - external_deps = [ - "zlib:libz", + public_external_deps = [ + "zlib:shared_libz", sdk_libc_secshared_dep, ] } @@ -205,11 +210,21 @@ ohos_source_set("libarkfile_frontend_set_static") { "$ark_root/libziparchive:libarkziparchive_frontend_static", ] - external_deps = [ sdk_libc_secshared_dep ] - if (!ark_standalone_build) { - public_external_deps = [ "zlib:libz" ] + if (is_arkui_x) { + deps += [ + "$ark_third_party_root/bounds_checking_function:libsec_static", + "$ark_third_party_root/zlib:libz", + ] + } else if (ark_standalone_build) { + external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] } else { - external_deps += [ "zlib:libz" ] + public_external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] } part_name = "runtime_core" diff --git a/libziparchive/BUILD.gn b/libziparchive/BUILD.gn index 89a06e1aca..fcb6075062 100644 --- a/libziparchive/BUILD.gn +++ b/libziparchive/BUILD.gn @@ -31,12 +31,21 @@ ohos_source_set("libarkziparchive_static") { deps = [ "$ark_root/libpandabase:libarkbase_static" ] - external_deps = [ sdk_libc_secshared_dep ] - - if (ark_standalone_build || is_arkui_x) { - external_deps += [ "zlib:libz" ] + if (is_arkui_x) { + deps += [ + "$ark_third_party_root/bounds_checking_function:libsec_static", + "$ark_third_party_root/zlib:libz", + ] + } else if (ark_standalone_build) { + external_deps = [ + "zlib:shared_libz", + sdk_libc_secshared_dep, + ] } else { - public_external_deps = [ "zlib:shared_libz" ] + public_external_deps = [ + "zlib:shared_libz", + sdk_libc_secshared_dep, + ] } if (enable_hilog) { @@ -73,10 +82,17 @@ ohos_source_set("libarkziparchive_frontend_set_static") { deps = [ "$ark_root/libpandabase:libarkbase_frontend_static" ] - external_deps = [ - "zlib:libz", - sdk_libc_secshared_dep, - ] + if (is_arkui_x) { + deps += [ + "$ark_third_party_root/bounds_checking_function:libsec_static", + "$ark_third_party_root/zlib:libz", + ] + } else { + external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] + } part_name = "runtime_core" subsystem_name = "arkcompiler"