Merge "Make libziparchive C++-only."

am: b175ee271b

Change-Id: Ifaa182ff77248653974e2e8a19e7f36147be47f1
This commit is contained in:
Elliott Hughes 2016-12-30 19:46:07 +00:00 committed by android-build-merger
commit b7c94f3e50

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_