commit 1ae0764e01ac0ad15cc16395fc36809343755823
author Dan Albert <danalbert@google.com> Thu Apr 09 14:11:18 2015 -0700
committer Dan Albert <danalbert@google.com> Thu Apr 09 17:00:14 2015 -0700
tree 2b439f1bd5c71d5ef871554e78b67325150c3457
parent cf9c855e5b1b656998a9f23f1f5005569c7168c5

Prevent unaligned read in libziparchive.

Change-Id: I4afc3729a1b2c06a6621cb8c9742fc94b5a665f5

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 0d31001..a3087ee 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := ${source_files}
 LOCAL_STATIC_LIBRARIES := libz
-LOCAL_SHARED_LIBRARIES := libutils
+LOCAL_SHARED_LIBRARIES := libutils libbase
 LOCAL_MODULE:= libziparchive
 LOCAL_CFLAGS := -Werror -Wall
 LOCAL_CPPFLAGS := -Wold-style-cast
@@ -30,7 +30,7 @@
 include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := ${source_files}
-LOCAL_STATIC_LIBRARIES := libz libutils
+LOCAL_STATIC_LIBRARIES := libz libutils libbase
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
 ifneq ($(strip $(USE_MINGW)),)
@@ -43,7 +43,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := ${source_files}
 LOCAL_STATIC_LIBRARIES := libz libutils
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog libbase
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
 LOCAL_MULTILIB := both
@@ -55,7 +55,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS := -Werror
 LOCAL_SRC_FILES := zip_archive_test.cc entry_name_utils_test.cc
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog libbase
 LOCAL_STATIC_LIBRARIES := libziparchive libz libutils
 include $(BUILD_NATIVE_TEST)
 
@@ -66,7 +66,7 @@
     -Werror \
     -Wno-unnamed-type-template-args
 LOCAL_SRC_FILES := zip_archive_test.cc entry_name_utils_test.cc
-LOCAL_SHARED_LIBRARIES := libziparchive-host liblog
+LOCAL_SHARED_LIBRARIES := libziparchive-host liblog libbase
 LOCAL_STATIC_LIBRARIES := \
     libz \
     libutils