commit 3abdea92efbe85c66d7f2dc662953d0b5ed59451
author Colin Cross <ccross@android.com> Thu Mar 22 18:46:44 2012 -0700
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:59 2013 -0700
tree ccbbd6d3e365f925d0a28a66a3878592e4200e1a
parent cd19987605f46133b5df4f1c8251bc21d48f74a9

frameworks/native: move Zip* from libandroidfw to libutils

ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: Ib8c41134ccdec6d6aa8d49860f8dddef49a24783

libs/utils/Android.mk

diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk
index b4fc994..a5a59d8 100644
--- a/libs/utils/Android.mk
+++ b/libs/utils/Android.mk
@@ -42,6 +42,9 @@
 	Unicode.cpp \
 	VectorImpl.cpp \
 	WorkQueue.cpp \
+	ZipFileCRO.cpp \
+	ZipFileRO.cpp \
+	ZipUtils.cpp \
 	misc.cpp
 
 host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
@@ -96,7 +99,8 @@
 endif
 
 LOCAL_C_INCLUDES += \
-		bionic/libc/private
+		bionic/libc/private \
+		external/zlib
 
 LOCAL_LDLIBS += -lpthread
 
@@ -104,7 +108,8 @@
 	liblog \
 	libcutils \
 	libdl \
-	libcorkscrew
+	libcorkscrew \
+	libz
 
 LOCAL_MODULE:= libutils
 include $(BUILD_SHARED_LIBRARY)