diff options
author | Elliott Hughes <enh@google.com> | 2014-12-10 21:44:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-10 21:44:31 +0000 |
commit | 79547e027abdfb4b2106f136ade2b6fd5f9b12d2 (patch) | |
tree | bba609513fb1f53ab8e5326d1d1e861d796a57ec | |
parent | f42217451397d7637b46f8478a5e77df3083baaa (diff) | |
parent | 26b9fbef3a176f4e2cea0873a06e903a1af95243 (diff) | |
download | zlib-lollipop-wear-release.tar.gz |
Merge "Kill libunz"android-wear-5.0.0_r1lollipop-wear-release
-rw-r--r-- | Android.mk | 28 |
1 files changed, 0 insertions, 28 deletions
@@ -56,7 +56,6 @@ LOCAL_MULTILIB := both LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_HOST_STATIC_LIBRARY) - include $(CLEAR_VARS) LOCAL_ARM_MODE := arm @@ -68,33 +67,6 @@ LOCAL_MULTILIB := both 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:= \ |