Add zlib to buildtools

am: 506e434bcd

Change-Id: I642dd7146757ffb2d62a68b5ae68e189c391a3c0

6 files changed, 47 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 14284b767..bb4e08e78 100644
--- a/Android.bp
+++ b/Android.bp
@@ -488,6 +488,7 @@ cc_binary {
     "libprotobuf-cpp-lite",
     "libservices",
     "libutils",
+    "libz",
   ],
   static_libs: [
     "libgtest_prod",
@@ -3091,6 +3092,7 @@ cc_test {
     "libservices",
     "libunwindstack",
     "libutils",
+    "libz",
   ],
   static_libs: [
     "libgmock",
@@ -3440,6 +3442,7 @@ cc_binary {
   shared_libs: [
     "liblog",
     "libprotobuf-cpp-lite",
+    "libz",
   ],
   static_libs: [
     "libgtest_prod",
diff --git a/buildtools/.gitignore b/buildtools/.gitignore
index 7f47a8ca1..c3961bc43 100644
--- a/buildtools/.gitignore
+++ b/buildtools/.gitignore
@@ -27,3 +27,4 @@ sqlite/
 sqlite_src/
 test_data/
 typefaces/
+zlib/
diff --git a/buildtools/BUILD.gn b/buildtools/BUILD.gn
index 55eee2c7f..c809e7cd2 100644
--- a/buildtools/BUILD.gn
+++ b/buildtools/BUILD.gn
@@ -674,6 +674,38 @@ source_set("lzma") {
   ]
 }
 
+source_set("zlib") {
+  defines = [
+    "ZLIB_CONST",
+    "USE_MMAP",
+    "HAVE_HIDDEN",
+  ]
+  sources = [
+    "zlib/src/adler32.c",
+    "zlib/src/compress.c",
+    "zlib/src/crc32.c",
+    "zlib/src/deflate.c",
+    "zlib/src/gzclose.c",
+    "zlib/src/gzlib.c",
+    "zlib/src/gzread.c",
+    "zlib/src/gzwrite.c",
+    "zlib/src/infback.c",
+    "zlib/src/inffast.c",
+    "zlib/src/inflate.c",
+    "zlib/src/inftrees.c",
+    "zlib/src/trees.c",
+    "zlib/src/uncompr.c",
+    "zlib/src/zutil.c",
+  ]
+  configs -= [ "//gn/standalone:extra_warnings" ]
+  cflags = []
+  public_configs = [ ":zlib_config" ]
+}
+
+config("zlib_config") {
+  include_dirs = [ "zlib/src" ]
+}
+
 source_set("libunwindstack") {
   include_dirs = [
     "android-core/libunwindstack/include",
diff --git a/src/perfetto_cmd/BUILD.gn b/src/perfetto_cmd/BUILD.gn
index b4ec76ceb..2a741a3bb 100644
--- a/src/perfetto_cmd/BUILD.gn
+++ b/src/perfetto_cmd/BUILD.gn
@@ -74,6 +74,7 @@ source_set("trigger_producer") {
   ]
   deps = [
     "../../buildtools:protobuf_lite",
+    "../../buildtools:zlib",
     "../../gn:default_deps",
     "../../protos/perfetto/config:lite",
     "../base",
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index f2719fe36..1ea320981 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -156,6 +156,9 @@ def enable_libunwind(module):
 def enable_sqlite(module):
     module.static_libs.append('libsqlite')
 
+def enable_zlib(module):
+    module.shared_libs.append('libz')
+
 # Android equivalents for third-party libraries that the upstream project
 # depends on.
 builtin_deps = {
@@ -169,6 +172,7 @@ builtin_deps = {
     '//buildtools:protoc_lib': enable_protoc_lib,
     '//buildtools:libunwindstack': enable_libunwindstack,
     '//buildtools:sqlite': enable_sqlite,
+    '//buildtools:zlib': enable_zlib,
 }
 
 # ----------------------------------------------------------------------------
diff --git a/tools/install-build-deps b/tools/install-build-deps
index 27e26788a..6744c4410 100755
--- a/tools/install-build-deps
+++ b/tools/install-build-deps
@@ -180,6 +180,12 @@ BUILD_DEPS_HOST = [
    'all'
   ),
 
+  ('buildtools/zlib',
+   'https://android.googlesource.com/platform/external/zlib.git',
+   'dfa0646a03b4e1707469e04dc931b09774968fe6',
+   'all'
+  ),
+
   ('buildtools/bionic',
    'https://android.googlesource.com/platform/bionic.git',
    'a60488109cda997dfd83832731c8527feaa2825e',