sdk: Use Yocto zlib recipe instead of //third_party/zlib fork

Signed-off-by: Esben Haabendal <esben@geanix.com>

recipes-openharmony/sdk/oniro-openharmony-bundle.bb

@@ -23,3 +23,9 @@ TOOLCHAIN_HOST_TASK += "nativesdk-openssl-dev"
 DEPENDS += "libunwind"
 RDEPENDS:${PN} = "libunwind"
 TOOLCHAIN_TARGET_TASK += "libcxx-dev"
+
+# zlib for target
+DEPENDS += "zlib minizip"
+RDEPENDS:${PN} = "zlib minizip"
+TOOLCHAIN_TARGET_TASK += "zlib-dev minizip-dev"
+

recipes-openharmony/sdk/oniro-openharmony-thirdparty-integration-3.0.inc

@@ -4,3 +4,6 @@
 
 SRC_URI += "file://third_party/libunwind/BUILD.gn;subdir=src/overlay"
 SRC_URI += "file://patches/no-processdump.patch;apply=no;subdir=src"
+
+SRC_URI += "file://third_party/zlib/BUILD.gn;subdir=src/overlay"
+SRC_URI += "file://patches/oniro-zlib.patch;apply=no;subdir=src"

recipes-openharmony/sdk/openharmony-3.0/BUILD.gn

@@ -10,6 +10,8 @@ group("third_party") {
       "//third_party/openssl:libcrypto",
       "//third_party/openssl:libssl",
       "//third_party/libunwind:libunwind",
+      "//third_party/zlib:libz",
+      "//third_party/zlib:libminizip",
     ]
   }
 }

recipes-openharmony/sdk/openharmony-3.0/patches/oniro-zlib.patch

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+Patch for OpenHarmony 3.0 codebase.
+
+This adapts to the modified //third_party/zlib/BUILD.gn using zlib and minizip
+from Yocto instead of the one normally used in OpenHarmony.
+
+Signed-off-by: Esben Haabendal <esben@geanix.com>
+Upstream-Status: Inappropriate [configuration/integration]
+
+diff -urN a/base/global/resmgr_standard/frameworks/resmgr/BUILD.gn b/base/global/resmgr_standard/frameworks/resmgr/BUILD.gn
+--- a/base/global/resmgr_standard/frameworks/resmgr/BUILD.gn	2023-02-10 14:03:27.652357540 +0100
++++ b/base/global/resmgr_standard/frameworks/resmgr/BUILD.gn	2023-02-10 09:59:04.630848580 +0100
+@@ -59,6 +59,7 @@
+     "//third_party/icu/icu4c:shared_icui18n",
+     "//third_party/icu/icu4c:shared_icuuc",
+     "//third_party/zlib:libz",
++    "//third_party/zlib:libminizip",
+   ]
+   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+ 
+diff -urN a/base/global/resmgr_standard/frameworks/resmgr/src/utils/hap_parser.cpp b/base/global/resmgr_standard/frameworks/resmgr/src/utils/hap_parser.cpp
+--- a/base/global/resmgr_standard/frameworks/resmgr/src/utils/hap_parser.cpp	2023-02-10 14:03:27.652357540 +0100
++++ b/base/global/resmgr_standard/frameworks/resmgr/src/utils/hap_parser.cpp	2023-02-10 09:58:13.813390202 +0100
+@@ -19,8 +19,8 @@
+ #include <cstdlib>
+ #include <iostream>
+ #include <string>
+-#include <unzip.h>
+-#include <zip.h>
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
+ #include <zlib.h>
+ 
+ #include "hilog_wrapper.h"
+diff -urN a/foundation/aafwk/standard/tools/zip/BUILD.gn b/foundation/aafwk/standard/tools/zip/BUILD.gn
+--- a/foundation/aafwk/standard/tools/zip/BUILD.gn	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/BUILD.gn	2023-02-10 10:04:27.042238421 +0100
+@@ -83,9 +83,10 @@
+     "//foundation/ace/napi:ace_napi",
+     "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher:appkit_dispatcher_td",
+     "//third_party/libuv:uv_static",
+-    "//third_party/zlib:libz",
+     "//utils/native/base:utils",
+   ]
++
++  public_deps = [ "//third_party/zlib:libminizip" ]
+ 
+   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+ 
+diff -urN a/foundation/aafwk/standard/tools/zip/include/zip_internal.h b/foundation/aafwk/standard/tools/zip/include/zip_internal.h
+--- a/foundation/aafwk/standard/tools/zip/include/zip_internal.h	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/include/zip_internal.h	2023-02-10 11:11:07.183689163 +0100
+@@ -18,8 +18,13 @@
+ 
+ #include <string>
+ #include <time.h>
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
++#else
+ #include "contrib/minizip/unzip.h"
+ #include "contrib/minizip/zip.h"
++#endif
+ #include "zip_utils.h"
+ 
+ namespace OHOS {
+diff -urN a/foundation/aafwk/standard/tools/zip/include/zip_reader.h b/foundation/aafwk/standard/tools/zip/include/zip_reader.h
+--- a/foundation/aafwk/standard/tools/zip/include/zip_reader.h	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/include/zip_reader.h	2023-02-10 11:10:42.226664313 +0100
+@@ -24,7 +24,11 @@
+ #include <stdio.h>
+ #include "file_path.h"
+ #include "zip_utils.h"
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#else
+ #include "contrib/minizip/unzip.h"
++#endif
+ 
+ namespace OHOS {
+ namespace AAFwk {
+diff -urN a/foundation/aafwk/standard/tools/zip/include/zip_writer.h b/foundation/aafwk/standard/tools/zip/include/zip_writer.h
+--- a/foundation/aafwk/standard/tools/zip/include/zip_writer.h	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/include/zip_writer.h	2023-02-10 11:11:34.820753781 +0100
+@@ -19,8 +19,13 @@
+ #include <vector>
+ #include "file_path.h"
+ #include "zip_utils.h"
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
++#else
+ #include "contrib/minizip/unzip.h"
+ #include "contrib/minizip/zip.h"
++#endif
+ 
+ namespace OHOS {
+ namespace AAFwk {
+diff -urN a/foundation/aafwk/standard/tools/zip/src/zip_reader.cpp b/foundation/aafwk/standard/tools/zip/src/zip_reader.cpp
+--- a/foundation/aafwk/standard/tools/zip/src/zip_reader.cpp	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/src/zip_reader.cpp	2023-02-10 11:11:51.827665986 +0100
+@@ -22,7 +22,11 @@
+ #include "string_ex.h"
+ #include "checked_cast.h"
+ #include "zip_internal.h"
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#else
+ #include "contrib/minizip/unzip.h"
++#endif
+ #include "zip_utils.h"
+ #include "hilog_wrapper.h"
+ 
+diff -urN a/foundation/aafwk/standard/tools/zip/src/zip_writer.cpp b/foundation/aafwk/standard/tools/zip/src/zip_writer.cpp
+--- a/foundation/aafwk/standard/tools/zip/src/zip_writer.cpp	2023-02-10 14:03:31.352403741 +0100
++++ b/foundation/aafwk/standard/tools/zip/src/zip_writer.cpp	2023-02-10 11:09:32.642317570 +0100
+@@ -18,7 +18,11 @@
+ #include "zip_internal.h"
+ #include "hilog_wrapper.h"
+ #include "directory_ex.h"
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/zip.h>
++#else
+ #include "contrib/minizip/zip.h"
++#endif
+ 
+ namespace OHOS {
+ namespace AAFwk {
+diff -urN a/foundation/ace/ace_engine/adapter/common/cpp/BUILD.gn b/foundation/ace/ace_engine/adapter/common/cpp/BUILD.gn
+--- a/foundation/ace/ace_engine/adapter/common/cpp/BUILD.gn	2023-02-10 14:03:31.439071491 +0100
++++ b/foundation/ace/ace_engine/adapter/common/cpp/BUILD.gn	2023-02-10 11:56:33.692841396 +0100
+@@ -51,7 +51,7 @@
+     }
+ 
+     if (is_ohos_platform) {
+-      deps = [ "//third_party/zlib:libz" ]
++      public_deps = [ "//third_party/zlib:libminizip" ]
+     }
+   }
+ }
+diff -urN a/foundation/ace/ace_engine/adapter/common/cpp/file_asset_provider.h b/foundation/ace/ace_engine/adapter/common/cpp/file_asset_provider.h
+--- a/foundation/ace/ace_engine/adapter/common/cpp/file_asset_provider.h	2023-02-10 14:03:31.439071491 +0100
++++ b/foundation/ace/ace_engine/adapter/common/cpp/file_asset_provider.h	2023-02-10 11:10:22.166377260 +0100
+@@ -21,7 +21,11 @@
+ #include <unordered_map>
+ #include <vector>
+ 
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#else
+ #include "contrib/minizip/unzip.h"
++#endif
+ #include "flutter/assets/asset_resolver.h"
+ #include "flutter/fml/mapping.h"
+ 
+diff -urN a/foundation/ace/ace_engine/adapter/ohos/cpp/ace_application_info.cpp b/foundation/ace/ace_engine/adapter/ohos/cpp/ace_application_info.cpp
+--- a/foundation/ace/ace_engine/adapter/ohos/cpp/ace_application_info.cpp	2023-02-10 14:03:31.439071491 +0100
++++ b/foundation/ace/ace_engine/adapter/ohos/cpp/ace_application_info.cpp	2023-02-10 11:10:08.579516619 +0100
+@@ -19,7 +19,11 @@
+ #include <iostream>
+ #include <sys/stat.h>
+ 
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#else
+ #include "contrib/minizip/unzip.h"
++#endif
+ #include "init_data.h"
+ #include "unicode/locid.h"
+ 
+diff -urN a/foundation/ace/ace_engine/adapter/ohos/cpp/BUILD.gn b/foundation/ace/ace_engine/adapter/ohos/cpp/BUILD.gn
+--- a/foundation/ace/ace_engine/adapter/ohos/cpp/BUILD.gn	2023-02-10 14:03:31.439071491 +0100
++++ b/foundation/ace/ace_engine/adapter/ohos/cpp/BUILD.gn	2023-02-10 11:21:32.246249959 +0100
+@@ -54,7 +54,7 @@
+       "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+       "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
+       "//foundation/graphic/standard:libwmclient",
+-      "//third_party/zlib:libz",
++      "//third_party/zlib:libminizip",
+     ]
+ 
+     public_deps =
+diff -urN a/foundation/ace/ace_engine/frameworks/core/components/form/BUILD.gn b/foundation/ace/ace_engine/frameworks/core/components/form/BUILD.gn
+--- a/foundation/ace/ace_engine/frameworks/core/components/form/BUILD.gn	2023-02-10 14:03:31.495738866 +0100
++++ b/foundation/ace/ace_engine/frameworks/core/components/form/BUILD.gn	2023-02-10 12:06:14.818782264 +0100
+@@ -29,4 +29,6 @@
+     "appexecfwk_standard:fmskit_native",
+     "ipc:ipc_core",
+   ]
++
++  configs = [ "//third_party/zlib:minizip_config" ]
+ }
+diff -urN a/foundation/appexecfwk/standard/services/bundlemgr/BUILD.gn b/foundation/appexecfwk/standard/services/bundlemgr/BUILD.gn
+--- a/foundation/appexecfwk/standard/services/bundlemgr/BUILD.gn	2023-02-10 14:03:31.732408491 +0100
++++ b/foundation/appexecfwk/standard/services/bundlemgr/BUILD.gn	2023-02-10 11:35:52.889298232 +0100
+@@ -63,9 +63,11 @@
+ 
+   deps = [
+     "${common_path}:libappexecfwk_common",
+-    "//third_party/zlib:libz",
+     "//utils/native/base:utils",
+   ]
++  public_deps = [
++    "//third_party/zlib:libminizip",
++  ]
+ 
+   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+ }
+diff -urN a/foundation/appexecfwk/standard/services/bundlemgr/include/zip_file.h b/foundation/appexecfwk/standard/services/bundlemgr/include/zip_file.h
+--- a/foundation/appexecfwk/standard/services/bundlemgr/include/zip_file.h	2023-02-10 14:03:31.732408491 +0100
++++ b/foundation/appexecfwk/standard/services/bundlemgr/include/zip_file.h	2023-02-10 11:32:14.369303695 +0100
+@@ -20,7 +20,11 @@
+ #include <map>
+ #include <string>
+ 
++#ifdef USE_SYSTEM_MINIZIP
++#include <minizip/unzip.h>
++#else
+ #include "unzip.h"
++#endif
+ 
+ namespace OHOS {
+ namespace AppExecFwk {
+diff -urN a/third_party/gstreamer/gstplugins_base/BUILD.gn b/third_party/gstreamer/gstplugins_base/BUILD.gn
+--- a/third_party/gstreamer/gstplugins_base/BUILD.gn	2023-02-10 14:03:38.252490153 +0100
++++ b/third_party/gstreamer/gstplugins_base/BUILD.gn	2023-02-10 10:53:08.987033929 +0100
+@@ -164,6 +164,9 @@
+         "//third_party/glib:gobject",
+         "//third_party/glib:gmodule",
+     ]
++    public_deps = [
++        "//third_party/zlib:libz"
++    ]
+     part_name = "multimedia_histreamer"
+     subsystem_name = "multimedia"
+ }
+diff -urN a/third_party/gstreamer/gstplugins_good/BUILD.gn b/third_party/gstreamer/gstplugins_good/BUILD.gn
+--- a/third_party/gstreamer/gstplugins_good/BUILD.gn	2023-02-10 14:03:38.335824533 +0100
++++ b/third_party/gstreamer/gstplugins_good/BUILD.gn	2023-02-10 10:35:47.550550934 +0100
+@@ -180,6 +180,7 @@
+         "//third_party/gstreamer/gstplugins_base:gstriff",
+         "//third_party/gstreamer/gstplugins_base:gstrtp",
+         "//third_party/zlib:libz",
++        "//third_party/zlib:libminizip",
+         "//third_party/glib:glib",
+         "//third_party/glib:gobject",
+         "//third_party/glib:gmodule",
+diff -urN a/third_party/gstreamer/gstreamer/BUILD.gn b/third_party/gstreamer/gstreamer/BUILD.gn
+--- a/third_party/gstreamer/gstreamer/BUILD.gn	2023-02-10 14:03:38.412492162 +0100
++++ b/third_party/gstreamer/gstreamer/BUILD.gn	2023-02-10 10:35:33.346992470 +0100
+@@ -231,6 +231,7 @@
+         ":gstbase_source",
+         ":gstreamer",
+         "//third_party/zlib:libz",
++        "//third_party/zlib:libminizip",
+         "//third_party/glib:glib",
+         "//third_party/glib:gobject",
+         "//third_party/glib:gmodule",

recipes-openharmony/sdk/openharmony-3.0/third_party/zlib/BUILD.gn

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import("//build/ohos.gni")
+import("//oniro/third_party.gni")
+
+ohos_prebuilt_shared_library("libz") {
+  source = "//oniro/sysroots/target/lib/libz.so.1.2.11"
+  subsystem_name = "common"
+  part_name = "common"
+  install_enable = install_oniro_third_party
+  install_images = [ "system", "updater" ]
+}
+
+ohos_prebuilt_shared_library("libminizip") {
+  source = "//oniro/sysroots/target/usr/lib/libminizip.so.1.0.0"
+  subsystem_name = "common"
+  part_name = "common"
+  install_enable = install_oniro_third_party
+  install_images = [ "system", "updater" ]
+  deps = [ ":libz" ]
+  public_configs = [ ":minizip_config" ]
+}
+
+config("minizip_config") {
+  cflags = [ "-DUSE_SYSTEM_MINIZIP" ]
+  libs = [ "z" ]
+}
+
+# The following targets and configs wraps existing targets and configs
+# to the above, so we don't need to modify other BUILD.gn files.
+
+config("zlib_config") {
+}