diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
| commit | f7d3a00df84eb03dcd01c9bfc952db4bf91419eb (patch) | |
| tree | 3a54ef34519d88fabca7d379491501ba5cbd1703 | |
| parent | 82ffbd8087f586bfa2196914287245a4cdc9f810 (diff) | |
| parent | a64e4eaf41f9520f60051b758fb27f98e72d85ea (diff) | |
| download | zlib-f7d3a00df84eb03dcd01c9bfc952db4bf91419eb.tar.gz | |
Merge korg/donut into korg/master
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 31 insertions, 4 deletions
@@ -5,7 +5,7 @@ include $(CLEAR_VARS) # than the thumb one... LOCAL_ARM_MODE := arm -LOCAL_SRC_FILES:= \ +zlib_files := \ adler32.c \ compress.c \ crc32.c \ @@ -19,11 +19,26 @@ LOCAL_SRC_FILES:= \ inftrees.c \ inffast.c -LOCAL_MODULE:= libz +LOCAL_MODULE := libz +LOCAL_CFLAGS += -O3 -DUSE_MMAP +LOCAL_SRC_FILES := $(zlib_files) +include $(BUILD_SHARED_LIBRARY) -LOCAL_CFLAGS+= -O3 -DUSE_MMAP +include $(CLEAR_VARS) -include $(BUILD_SHARED_LIBRARY) +LOCAL_ARM_MODE := arm +LOCAL_MODULE := libz +LOCAL_CFLAGS += -O3 -DUSE_MMAP +LOCAL_SRC_FILES := $(zlib_files) +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm +LOCAL_MODULE := libz +LOCAL_CFLAGS += -O3 -DUSE_MMAP +LOCAL_SRC_FILES := $(zlib_files) +include $(BUILD_HOST_STATIC_LIBRARY) @@ -57,3 +72,15 @@ LOCAL_MODULE:= gzip LOCAL_SHARED_LIBRARIES := libz include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + minigzip.c + +LOCAL_MODULE:= minigzip + +LOCAL_STATIC_LIBRARIES := libz + +include $(BUILD_HOST_EXECUTABLE) + |