diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn index 8c67242168..483e8c8756 100644 --- a/libpandafile/BUILD.gn +++ b/libpandafile/BUILD.gn @@ -21,11 +21,6 @@ config("arkfile_public_config") { "$target_gen_dir/include", ] - include_dirs += [ - "//third_party/zlib", - "//third_party/zlib/contrib/minizip", - ] - defines = [] if (is_ohos && !is_standard_system) { defines += [ "ENABLE_FULL_FILE_FIELDS" ] @@ -111,6 +106,11 @@ ohos_static_library("libarkfile_static") { ] external_deps = [ sdk_libc_secshared_dep ] + if (!ark_standalone_build) { + public_external_deps = [ "zlib:libz" ] + } else { + external_deps += [ "zlib:libz" ] + } part_name = "runtime_core" subsystem_name = "arkcompiler" @@ -129,6 +129,11 @@ ohos_source_set("libarkfile_static_fuzz") { ] external_deps = [ sdk_libc_secshared_dep ] + if (!ark_standalone_build) { + public_external_deps = [ "zlib:libz" ] + } else { + external_deps += [ "zlib:libz" ] + } part_name = "runtime_core" subsystem_name = "arkcompiler" @@ -182,6 +187,11 @@ ohos_source_set("libarkfile_frontend_set_static") { ] external_deps = [ sdk_libc_secshared_dep ] + if (!ark_standalone_build) { + public_external_deps = [ "zlib:libz" ] + } else { + external_deps += [ "zlib:libz" ] + } part_name = "runtime_core" subsystem_name = "arkcompiler" diff --git a/libpandafile/tests/BUILD.gn b/libpandafile/tests/BUILD.gn index dc6be54b19..d21899d1b0 100644 --- a/libpandafile/tests/BUILD.gn +++ b/libpandafile/tests/BUILD.gn @@ -42,7 +42,10 @@ host_unittest_action("LibPandaFileTest") { "//third_party/googletest:gmock_main", ] - external_deps = [ sdk_libc_secshared_dep ] + external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] cflags = [ "-DWITH_MOCK" ] } diff --git a/libziparchive/BUILD.gn b/libziparchive/BUILD.gn index 023524e964..b3859ea073 100644 --- a/libziparchive/BUILD.gn +++ b/libziparchive/BUILD.gn @@ -18,11 +18,6 @@ config("arkziparchive_config") { "$ark_root/libziparchive", "$ark_root/libpandabase", ] - - include_dirs += [ - "//third_party/zlib", - "//third_party/zlib/contrib/minizip", - ] } ohos_source_set("libarkziparchive_static") { @@ -41,7 +36,7 @@ ohos_source_set("libarkziparchive_static") { if (ark_standalone_build || is_arkui_x) { external_deps += [ "zlib:libz" ] } else { - external_deps += [ "zlib:shared_libz" ] + public_external_deps = [ "zlib:shared_libz" ] } part_name = "runtime_core" @@ -74,9 +69,10 @@ ohos_source_set("libarkziparchive_frontend_set_static") { deps = [ "$ark_root/libpandabase:libarkbase_frontend_static" ] - external_deps = [ sdk_libc_secshared_dep ] - - external_deps += [ "zlib:libz" ] + external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] part_name = "runtime_core" subsystem_name = "arkcompiler" diff --git a/libziparchive/tests/BUILD.gn b/libziparchive/tests/BUILD.gn index 9f4179645e..b5de56f91c 100644 --- a/libziparchive/tests/BUILD.gn +++ b/libziparchive/tests/BUILD.gn @@ -33,7 +33,10 @@ host_unittest_action("LibZipArchiveTest") { "$ark_root/libziparchive:libarkziparchive_static", ] - external_deps = [ sdk_libc_secshared_dep ] + external_deps = [ + "zlib:libz", + sdk_libc_secshared_dep, + ] } group("unittest") { diff --git a/libziparchive/zip_archive.h b/libziparchive/zip_archive.h index 5917bd63d6..2681c9b00c 100644 --- a/libziparchive/zip_archive.h +++ b/libziparchive/zip_archive.h @@ -17,8 +17,8 @@ #define LIBZIPARCHIVE_ZIP_ARCHIVE_H #include -#include "unzip.h" -#include "zip.h" +#include +#include namespace panda { diff --git a/verifier/BUILD.gn b/verifier/BUILD.gn index 46597534be..d1972bf4b0 100755 --- a/verifier/BUILD.gn +++ b/verifier/BUILD.gn @@ -33,8 +33,8 @@ ohos_executable("ark_verifier") { sources = arkverifier_sources deps = [ "$ark_root/libpandafile:libarkfile_static_verifier" ] + external_deps = [ "zlib:libz" ] - external_deps = [] if (enable_hilog) { external_deps += [ "hilog:libhilog" ] } @@ -57,7 +57,7 @@ ohos_shared_library("libarkverifier") { sources = libarkverifier_sources deps = [ "$ark_root/libpandafile:libarkfile_static_verifier" ] - external_deps = [] + external_deps = [ "zlib:libz" ] if (enable_hilog) { external_deps += [ "hilog:libhilog" ] }