From 135127b04d822d2983817bd0fb319012741d394f Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Mon, 6 May 2024 19:05:11 +0800 Subject: [PATCH 1/7] Signed-off-by:hanqiaosheng --- BUILD.gn | 37 +++++++++++++++++++++++++++++++++++++ bundle.json | 7 +++++++ 2 files changed, 44 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 1debc8b..5e09888 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -59,6 +59,43 @@ ohos_static_library("libz") { subsystem_name = "thirdparty" } +ohos_static_library("libz_static") { + sources = [ + "adler32.c", + "compress.c", + "contrib/minizip/ioapi.c", + "contrib/minizip/unzip.c", + "contrib/minizip/zip.c", + "deflate.c", + "deflate.h", + "gzclose.c", + "gzguts.h", + "gzlib.c", + "gzread.c", + "gzwrite.c", + "infback.c", + "inffast.c", + "inffast.h", + "inffixed.h", + "inflate.c", + "inflate.h", + "inftrees.c", + "inftrees.h", + "trees.c", + "trees.h", + "uncompr.c", + "zconf.h", + "zlib.h", + "zutil.c", + "zutil.h", + ] + configs = [ ":zlib_config" ] + public_configs = [ ":zlib_public_config" ] + + part_name = "zlib" + subsystem_name = "thirdparty" +} + ohos_shared_library("shared_libz") { sources = [ "adler32.c", diff --git a/bundle.json b/bundle.json index 43c2fd5..54beaec 100644 --- a/bundle.json +++ b/bundle.json @@ -40,6 +40,13 @@ "header_files": "" }, "name": "//third_party/zlib:shared_libz" + }, + { + "header": { + "header_base": "//third_party/zlib", + "header_files": "" + }, + "name": "//third_party/zlib:libz_static" } ], "test": [] -- Gitee From aa4d723c49863a30a2fa9b2d3f13b8131b755c2b Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Wed, 8 May 2024 10:04:59 +0800 Subject: [PATCH 2/7] Signed-off-by:hanqiaosheng --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 54beaec..9acfaa3 100644 --- a/bundle.json +++ b/bundle.json @@ -43,7 +43,7 @@ }, { "header": { - "header_base": "//third_party/zlib", + "header_base": "", "header_files": "" }, "name": "//third_party/zlib:libz_static" -- Gitee From 23d05bae268347741d257930e8baa6ee6cec3aac Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Wed, 8 May 2024 21:46:17 +0800 Subject: [PATCH 3/7] Signed-off-by:hanqiaosheng --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 9acfaa3..ebcd8b1 100644 --- a/bundle.json +++ b/bundle.json @@ -43,7 +43,7 @@ }, { "header": { - "header_base": "", + "header_base": "//third_party/zlib/contrib", "header_files": "" }, "name": "//third_party/zlib:libz_static" -- Gitee From 2808d3f126dc437d734edb43d5bd3605493b2b08 Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Thu, 9 May 2024 20:23:34 +0800 Subject: [PATCH 4/7] Signed-off-by:hanqiaosheng --- BUILD.gn | 5 ++++- bundle.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 5e09888..2cb6b6b 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -90,7 +90,10 @@ ohos_static_library("libz_static") { "zutil.h", ] configs = [ ":zlib_config" ] - public_configs = [ ":zlib_public_config" ] + public_configs = [ + ".", + "contrib/minizip", + ] part_name = "zlib" subsystem_name = "thirdparty" diff --git a/bundle.json b/bundle.json index ebcd8b1..54beaec 100644 --- a/bundle.json +++ b/bundle.json @@ -43,7 +43,7 @@ }, { "header": { - "header_base": "//third_party/zlib/contrib", + "header_base": "//third_party/zlib", "header_files": "" }, "name": "//third_party/zlib:libz_static" -- Gitee From b6587f97cff7657e8d898279451d2929f0c81ea1 Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Thu, 9 May 2024 20:40:44 +0800 Subject: [PATCH 5/7] Signed-off-by:hanqiaosheng --- BUILD.gn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 2cb6b6b..f861673 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -59,6 +59,12 @@ ohos_static_library("libz") { subsystem_name = "thirdparty" } +config("zlib_static_config") { + include_dirs = [ + ".", + "contrib/minizip", + ] +} ohos_static_library("libz_static") { sources = [ "adler32.c", @@ -89,7 +95,7 @@ ohos_static_library("libz_static") { "zutil.c", "zutil.h", ] - configs = [ ":zlib_config" ] + configs = [ ":zlib_static_config" ] public_configs = [ ".", "contrib/minizip", -- Gitee From fbc2b0cbc60c86e2a4da68f9a79c92103642d1d8 Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Thu, 9 May 2024 21:32:50 +0800 Subject: [PATCH 6/7] Signed-off-by:hanqiaosheng --- BUILD.gn | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f861673..ecb1e55 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -95,11 +95,8 @@ ohos_static_library("libz_static") { "zutil.c", "zutil.h", ] - configs = [ ":zlib_static_config" ] - public_configs = [ - ".", - "contrib/minizip", - ] + configs = [ ":zlib_config" ] + public_configs = [ "zlib_static_config" ] part_name = "zlib" subsystem_name = "thirdparty" -- Gitee From 0257f71b6178d02056b383bc494d6f9da98df50b Mon Sep 17 00:00:00 2001 From: the_big_blue_devil Date: Thu, 9 May 2024 23:02:20 +0800 Subject: [PATCH 7/7] Signed-off-by:hanqiaosheng --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index ecb1e55..908d265 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -96,7 +96,7 @@ ohos_static_library("libz_static") { "zutil.h", ] configs = [ ":zlib_config" ] - public_configs = [ "zlib_static_config" ] + public_configs = [ ":zlib_static_config" ] part_name = "zlib" subsystem_name = "thirdparty" -- Gitee