Merge "Kill libunz"
diff --git a/Android.mk b/Android.mk
index 444e2a3..6b79033 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,7 +56,6 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_HOST_STATIC_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
@@ -68,33 +67,6 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_HOST_SHARED_LIBRARY)
-
-
-# libunz used to be an unzip-only subset of libz. Only host-side tools were
-# taking advantage of it, though, and it's not a notion supported by zlib
-# itself. This caused trouble during the 1.2.6 upgrade because libunz ended
-# up needing to drag in most of the other files anyway. So this is a first
-# step towards killing libunz. If you're reading this in the K release or
-# later, please see if you can get a bit further in removing libunz...
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(zlib_files)
-LOCAL_MODULE:= libunz
-LOCAL_ARM_MODE := arm
-LOCAL_MULTILIB := both
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(zlib_files)
-LOCAL_MODULE:= libunz
-LOCAL_ARM_MODE := arm
-ifeq ($(TARGET_ARCH),arm)
- LOCAL_SDK_VERSION := 9
-endif
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_STATIC_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
