From ae52e02b1b7d31548a17b2fbefd861298dadfcbd Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 8 Nov 2016 11:42:29 -0800
Subject: [PATCH] Continue using the legacy zlib headers.

Test: make native
      Built an NDK with this and used it to build ffmpeg
Bug: None

Change-Id: Ifa3f861341632ebe6fdeb76ae5e566c6b31ed988
---
 ndk/Android.bp  | 26 ++++++++++++++++++++++++++
 ndk/NOTICE.zlib | 20 ++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 ndk/Android.bp
 create mode 100644 ndk/NOTICE.zlib

diff --git a/ndk/Android.bp b/ndk/Android.bp
new file mode 100644
index 000000000..b350ea0ab
--- /dev/null
+++ b/ndk/Android.bp
@@ -0,0 +1,26 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+ndk_headers {
+    name: "libz_headers",
+    from: "platforms/android-9/include",
+    to: "",
+    srcs: [
+        "platforms/android-9/include/zconf.h",
+        "platforms/android-9/include/zlib.h",
+    ],
+    license: "NOTICE.zlib",
+}
diff --git a/ndk/NOTICE.zlib b/ndk/NOTICE.zlib
new file mode 100644
index 000000000..785e1e15c
--- /dev/null
+++ b/ndk/NOTICE.zlib
@@ -0,0 +1,20 @@
+ (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu