| commit | a55bf0970dbaf3141c795a760129bfc4b2f9adef | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Jul 03 08:18:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 03 08:18:20 2017 +0000 |
| tree | b56981290e43cc5cc506d307c9cea3f0bf4bfb8d | |
| parent | 55b896f1e58e1dbcb9bc575ea0bbaca5098cee1f [diff] | |
| parent | da3af937a15cd609ce38cb96b8c7bfc0a8b4d6bc [diff] |
Merge "libziparchive headers are moved to local directory" am: 7b44858b91 am: 4724e91dad am: da3af937a1 Change-Id: Id24f61623f260a77adb720d23e5f7ffe25410917
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