| commit | 4724e91dadb6b2e3f24f9afe600f98be2ee964fa | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Jul 03 08:12:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 03 08:12:51 2017 +0000 |
| tree | e8521342355a9c5bcce25bd1afaf8ae2f41a2f20 | |
| parent | 1fd5216370afb88605de2aa3e39fae50eadd8b92 [diff] | |
| parent | 7b44858b91624b57c26bedf36ba6e9850c55a481 [diff] |
Merge "libziparchive headers are moved to local directory" am: 7b44858b91 Change-Id: I77e446012003528ae4180f8450bc96563259f34f
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