From cdf7ff8e204beb6bbfe263c3d6255c2b2d0095a7 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Sun, 2 Jul 2017 11:52:40 +0900
Subject: [PATCH] libziparchive headers are moved to local directory

libziparchive headers are moved from the global include directory
(/system/core/include) to the local directory inside libziparchive.

Note: /system/core/include/ziparchive still exists as a symlink to
libarchive/include/ziparchive. This will be removed when there is no
header-only dependency to libziparchive.

Bug: 37342627
Test: build
Change-Id: I3631ffc2df7be8a064d64a625d10436090c3bb0f
---
 include/ziparchive                                               | 1 +
 libziparchive/Android.bp                                         | 1 +
 {include => libziparchive/include}/ziparchive/zip_archive.h      | 0
 .../include}/ziparchive/zip_archive_stream_entry.h               | 0
 {include => libziparchive/include}/ziparchive/zip_writer.h       | 0
 5 files changed, 2 insertions(+)
 create mode 120000 include/ziparchive
 rename {include => libziparchive/include}/ziparchive/zip_archive.h (100%)
 rename {include => libziparchive/include}/ziparchive/zip_archive_stream_entry.h (100%)
 rename {include => libziparchive/include}/ziparchive/zip_writer.h (100%)

diff --git a/include/ziparchive b/include/ziparchive
new file mode 120000
index 000000000..d8fa4246b
--- /dev/null
+++ b/include/ziparchive
@@ -0,0 +1 @@
+../libziparchive/include/ziparchive
\ No newline at end of file
diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 1084d59e5..84a9a2f9b 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -65,6 +65,7 @@ cc_library {
         "liblog",
         "libbase",
     ],
+    export_include_dirs: ["include"],
     target: {
         android: {
             shared_libs: [
diff --git a/include/ziparchive/zip_archive.h b/libziparchive/include/ziparchive/zip_archive.h
similarity index 100%
rename from include/ziparchive/zip_archive.h
rename to libziparchive/include/ziparchive/zip_archive.h
diff --git a/include/ziparchive/zip_archive_stream_entry.h b/libziparchive/include/ziparchive/zip_archive_stream_entry.h
similarity index 100%
rename from include/ziparchive/zip_archive_stream_entry.h
rename to libziparchive/include/ziparchive/zip_archive_stream_entry.h
diff --git a/include/ziparchive/zip_writer.h b/libziparchive/include/ziparchive/zip_writer.h
similarity index 100%
rename from include/ziparchive/zip_writer.h
rename to libziparchive/include/ziparchive/zip_writer.h