commit df7d31c06e36cb1a3d556c1a163c99415938aabc
author Lalit Maganti <lalitm@google.com> Tue Jun 18 13:18:57 2019 +0100
committer Lalit Maganti <lalitm@google.com> Tue Jun 18 13:18:57 2019 +0100
tree c430cd8b1169189f3d7660446ff351db8d5d5c5c
parent 3246bbbe5956c6f893a9ac49e43f8194f9d3b987

Fixed zlib dependency for g3 gen_bazel

Depending on this target instead of the default enables
includes of <zlib.h> which is now used.

R=lalit@google.com,ssid@google.com

Change-Id: I0dd22fe3ad057a05d007f967f8acddcdd30bdc73

BUILD

diff --git a/BUILD b/BUILD
index 209fb83..050d488 100644
--- a/BUILD
+++ b/BUILD
@@ -332,7 +332,6 @@
     deps = [
         "//third_party/perfetto:gen_merged_sql_metrics",
         "//third_party/perfetto/google:jsoncpp",
-        "//third_party/perfetto/google:zlib",
         "//third_party/perfetto/protos:common_zero_cc_proto",
         "//third_party/perfetto/protos:config_zero_cc_proto",
         "//third_party/perfetto/protos:metrics_android_zero_cc_proto",
@@ -353,6 +352,7 @@
         "//third_party/perfetto/protos:trace_zero_cc_proto",
         "//third_party/sqlite",
         "//third_party/sqlite:sqlite_ext_percentile",
+        "//third_party/zlib:zlibsystem",
     ],
 )
 
@@ -569,7 +569,6 @@
         "//third_party/perfetto/google:jsoncpp",
         "//third_party/perfetto/google:linenoise",
         "//third_party/perfetto/google:perfetto_version",
-        "//third_party/perfetto/google:zlib",
         "//third_party/perfetto/protos:common_zero_cc_proto",
         "//third_party/perfetto/protos:config_zero_cc_proto",
         "//third_party/perfetto/protos:metrics_android_zero_cc_proto",
@@ -592,6 +591,7 @@
         "//third_party/protobuf:libprotoc",
         "//third_party/sqlite",
         "//third_party/sqlite:sqlite_ext_percentile",
+        "//third_party/zlib:zlibsystem",
     ],
 )
 
@@ -817,7 +817,6 @@
         "//third_party/perfetto:gen_merged_sql_metrics",
         "//third_party/perfetto/google:jsoncpp",
         "//third_party/perfetto/google:perfetto_version",
-        "//third_party/perfetto/google:zlib",
         "//third_party/perfetto/protos:common_cc_proto",
         "//third_party/perfetto/protos:common_zero_cc_proto",
         "//third_party/perfetto/protos:config_cc_proto",
@@ -857,6 +856,7 @@
         "//third_party/protobuf:libprotoc",
         "//third_party/sqlite",
         "//third_party/sqlite:sqlite_ext_percentile",
+        "//third_party/zlib:zlibsystem",
     ],
 )
 

tools/gen_bazel

diff --git a/tools/gen_bazel b/tools/gen_bazel
index 57ee3d8..7f9b544 100755
--- a/tools/gen_bazel
+++ b/tools/gen_bazel
@@ -104,7 +104,7 @@
 
 
 def enable_zlib(module):
-  module.deps.add(Label('//third_party/perfetto/google:zlib'))
+  module.deps.add(Label('//third_party/zlib:zlibsystem'))
 
 
 def disable_module(module):