summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-05-10 17:23:47 -0700
committerElliott Hughes <enh@google.com>2012-05-10 17:28:12 -0700
commit00fb66d0b1488e4ca655906f82b27eb2ccc3e309 (patch)
treeab1a1f230a9e066738e21a4ac8b2a84575a117d9 /Android.mk
parent5dd6e2841de742f8076508b70be639f79da203d0 (diff)
downloadzlib-00fb66d0b1488e4ca655906f82b27eb2ccc3e309.tar.gz
Separate the Android build stuff from the upstream zlib stuff.
Another step towards a script that does the zlib upgrades for us... Change-Id: I940b5b4e79d2a8daf7a47129bbea7bdaffd4140c
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk34
1 files changed, 17 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk
index f96a36f..e02b488 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,21 +6,21 @@ include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
zlib_files := \
- adler32.c \
- compress.c \
- crc32.c \
- deflate.c \
- gzclose.c \
- gzlib.c \
- gzread.c \
- gzwrite.c \
- infback.c \
- inflate.c \
- inftrees.c \
- inffast.c \
- trees.c \
- uncompr.c \
- zutil.c
+ src/adler32.c \
+ src/compress.c \
+ src/crc32.c \
+ src/deflate.c \
+ src/gzclose.c \
+ src/gzlib.c \
+ src/gzread.c \
+ src/gzwrite.c \
+ src/infback.c \
+ src/inflate.c \
+ src/inftrees.c \
+ src/inffast.c \
+ src/trees.c \
+ src/uncompr.c \
+ src/zutil.c
LOCAL_MODULE := libz
LOCAL_MODULE_TAGS := optional
@@ -92,7 +92,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- test/minigzip.c
+ src/test/minigzip.c
LOCAL_MODULE:= gzip
@@ -103,7 +103,7 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- test/minigzip.c
+ src/test/minigzip.c
LOCAL_MODULE:= minigzip