| commit | cdf7ff8e204beb6bbfe263c3d6255c2b2d0095a7 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Sun Jul 02 11:52:40 2017 +0900 |
| committer | Colin Cross <ccross@android.com> | Sun Jul 02 04:33:34 2017 +0000 |
| tree | c5cb33d4d99a46b0d622eb30b82d7de11e2dd10a | |
| parent | cd997e609405cfd6b1f82a1f849f98352b12ae72 [diff] |
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
diff --git a/include/ziparchive b/include/ziparchive new file mode 120000 index 0000000..d8fa424 --- /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 1084d59..84a9a2f 100644 --- a/libziparchive/Android.bp +++ b/libziparchive/Android.bp
@@ -65,6 +65,7 @@ "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