Don't ship updated zlib headers in the NDK.

Updating these headers to be usable for any API level is going to be
some work (at the very least, there's a ZLIB_VERNUM that will need to
be handled since early versions of Android did not have all the APIs
that calling code will use if this is set to the current value.

The NDK never updated the zlib headers when the platform updated, so
until we solve this the NDK will continue shipping the old headers.

Test: make native
Bug: None
Change-Id: Idaf15638ca83300f46959b95e53f3c112f108505

1 files changed, 20 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 47e6f6b..da01daf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -80,17 +80,26 @@ cc_binary_host {
     stl: "none",
 }
 
-ndk_headers {
-    name: "libz_headers",
-    from: "src",
-    to: "",
-    srcs: [
-        "src/zconf.h",
-        "src/zlib.h",
-        "src/zutil.h",
-    ],
-    license: "NOTICE",
-}
+// This module is defined in development/ndk/Android.bp. Updating these headers
+// to be usable for any API level is going to be some work (at the very least,
+// there's a ZLIB_VERNUM that will need to be handled since early versions of
+// Android did not have all the APIs that calling code will use if this is set
+// to the current value.
+//
+// The NDK never updated the zlib headers when the platform updated, so until we
+// solve this the NDK will continue shipping the old headers.
+//
+// ndk_headers {
+//     name: "libz_headers",
+//     from: "src",
+//     to: "",
+//     srcs: [
+//         "src/zconf.h",
+//         "src/zlib.h",
+//         "src/zutil.h",
+//     ],
+//     license: "NOTICE",
+// }
 
 ndk_library {
     name: "libz.ndk",