Merge "Make libziparchive C++-only." am: b175ee271b am: b7c94f3e50

am: 8f378bc31e

Change-Id: I748dfc6bfdf7430a3eda94624258d48b253310b9
This commit is contained in:
Elliott Hughes 2016-12-30 20:02:08 +00:00 committed by android-build-merger
commit 478ffd46ce

View file

@ -26,8 +26,6 @@
#include <sys/types.h>
#include <utils/Compat.h>
__BEGIN_DECLS
/* Zip compression methods we support */
enum {
kCompressStored = 0, // no compression
@ -228,6 +226,4 @@ int32_t ProcessZipEntryContents(ZipArchiveHandle handle, ZipEntry* entry,
ProcessZipEntryFunction func, void* cookie);
#endif
__END_DECLS
#endif // LIBZIPARCHIVE_ZIPARCHIVE_H_