diff options
| author | Nick Kralevich <nnk@google.com> | 2013-05-24 18:33:58 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-05-24 18:33:58 -0700 |
| commit | a5c7131da47c991585a6c6ac0c063b6d7d56e3fc (patch) | |
| tree | 79e46d63dd865226f3aac7e3a0ed9895373243be | |
| parent | 4018ebf35d1ab1cd6b1340f44df0a1095cb5d10d (diff) | |
| download | zlib-kitkat-mr1-release.tar.gz | |
Revert "Add signed integer overflow checking to zlib"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devidea133-weekly-releaseidea133
The build is broken.
This reverts commit 4018ebf35d1ab1cd6b1340f44df0a1095cb5d10d.
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -4,7 +4,6 @@ include $(CLEAR_VARS) # measurements show that the ARM version of ZLib is about x1.17 faster # than the thumb one... LOCAL_ARM_MODE := arm -LOCAL_CLANG := true zlib_files := \ src/adler32.c \ @@ -26,7 +25,6 @@ zlib_files := \ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP -LOCAL_CFLAGS += -ftrapv LOCAL_SRC_FILES := $(zlib_files) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 @@ -35,12 +33,10 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_ARM_MODE := arm LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP -LOCAL_CFLAGS += -ftrapv LOCAL_SRC_FILES := $(zlib_files) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 @@ -49,24 +45,20 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_ARM_MODE := arm LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP -LOCAL_CFLAGS += -ftrapv LOCAL_SRC_FILES := $(zlib_files) include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_ARM_MODE := arm LOCAL_MODULE := libz-host LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP -LOCAL_CFLAGS += -ftrapv LOCAL_SRC_FILES := $(zlib_files) include $(BUILD_HOST_SHARED_LIBRARY) @@ -80,19 +72,15 @@ include $(BUILD_HOST_SHARED_LIBRARY) # later, please see if you can get a bit further in removing libunz... include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_SRC_FILES := $(zlib_files) LOCAL_MODULE:= libunz LOCAL_ARM_MODE := arm -LOCAL_CFLAGS += -ftrapv include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_SRC_FILES := $(zlib_files) LOCAL_MODULE:= libunz LOCAL_ARM_MODE := arm -LOCAL_CFLAGS += -ftrapv ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif @@ -100,7 +88,6 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_SRC_FILES:= \ src/test/minigzip.c @@ -108,18 +95,15 @@ LOCAL_MODULE:= gzip LOCAL_SHARED_LIBRARIES := libz -LOCAL_CFLAGS += -ftrapv include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_SRC_FILES:= \ src/test/minigzip.c LOCAL_MODULE:= minigzip -LOCAL_CFLAGS += -ftrapv LOCAL_STATIC_LIBRARIES := libz include $(BUILD_HOST_EXECUTABLE) |