| commit | 730fb6b43a5888eadfee61d2e0392e9f1d31c38b | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Jul 03 08:21:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 03 08:21:20 2017 +0000 |
| tree | 378792d2e9aa202296d1541a57b63f5f1e75b102 | |
| parent | 535e226e63b28049ec684728016fa05e33a8e462 [diff] | |
| parent | a55bf0970dbaf3141c795a760129bfc4b2f9adef [diff] |
Merge "libziparchive headers are moved to local directory" am: 7b44858b91 am: 4724e91dad am: da3af937a1 am: a55bf0970d Change-Id: Ifbba9a1b427cf37d3099e21335f77d231017e624
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