summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-04-27 16:25:53 +0100
committerElliott Hughes <enh@google.com>2015-06-04 13:26:22 -0700
commit67ab5d95058d6fe1bab71b3f69e1934728902995 (patch)
tree7558fcaa5d56f472f58471a1157b2f0c0bda105c /fastboot
parent4ba18cf3ffae39c86ef3c968871b331f1e7df914 (diff)
downloadsystem_core-67ab5d95058d6fe1bab71b3f69e1934728902995.zip
system_core-67ab5d95058d6fe1bab71b3f69e1934728902995.tar.gz
system_core-67ab5d95058d6fe1bab71b3f69e1934728902995.tar.bz2
Use base::WriteFully in zip_archive.
We're already linking against libbase but we'll have to add a libbase dependency to every target that includes libziparchive as a STATIC_LIBRARY dependency, given that there's no way to express that what we want (except by adding a LOCAL_WHOLE_STATIC_LIBRARY dependency on libbase to libziparchive but that seems bad too) Bug: http://b/21558406 Change-Id: I294ad389a9c61a1134a7bc323da25b0004a8f1e0 (cherry picked from commit e97e66ea7c624190afa4639d6ddc60e7d013f46c)
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 0648826..23cb404 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -58,7 +58,8 @@ LOCAL_STATIC_LIBRARIES := \
libsparse_host \
libutils \
liblog \
- libz
+ libz \
+ libbase
ifneq ($(HOST_OS),windows)
LOCAL_STATIC_LIBRARIES += libselinux