commit 42f3beff01d9c1bbb20b08fdd7bb04674f1a3159
author John Bauman <jbauman@google.com> Wed Apr 18 18:37:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 18 18:37:41 2018 +0000
tree fa06d1994920b15d54a22578d7f4c80ece9668ef
parent b7bcc6327075172af2691e3d36d855a8f1f111cb
parent 89e9cd79703a7ac6efd1962138a58c8ecf210169

Merge "Add static library build"

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6cef35a..7d1fa38 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -36,9 +36,26 @@
   cflags = [ "-Wno-implicit-function-declaration" ]
 }
 
-shared_library("zlib") {
-  output_name = "z"
+if (is_fuchsia) {
+  shared_library("zlib") {
+    output_name = "z"
+    deps = [
+      ":zlib_static",
+    ]
 
+    public_configs = [ ":zlib_config" ]
+  }
+} else {
+  group("zlib") {
+    deps = [
+      ":zlib_static",
+    ]
+
+    public_configs = [ ":zlib_config" ]
+  }
+}
+
+source_set("zlib_static") {
   sources = [
     "adler32.c",
     "compress.c",
@@ -84,7 +101,7 @@
   }
 }
 
-shared_library("minizip") {
+target(default_library_type, "minizip") {
   sources = [
     "contrib/minizip/crypt.h",
     "contrib/minizip/ioapi.c",