diff options
author | Kenny Root <kroot@google.com> | 2012-10-17 02:49:23 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 02:49:23 +0200 |
commit | a0d9ddb8f2922088b08219326afeaf532b3af5ac (patch) | |
tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /minzip/Android.mk | |
parent | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff) | |
parent | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp (diff) | |
download | android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.gz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.bz2 android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.lz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.xz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.zst android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.zip |
Diffstat (limited to 'minzip/Android.mk')
-rw-r--r-- | minzip/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/minzip/Android.mk b/minzip/Android.mk index 6c1d0969c..045f35570 100644 --- a/minzip/Android.mk +++ b/minzip/Android.mk @@ -8,15 +8,11 @@ LOCAL_SRC_FILES := \ Inlines.c \ Zip.c -LOCAL_C_INCLUDES += \ +LOCAL_C_INCLUDES := \ external/zlib \ external/safe-iop/include -ifeq ($(HAVE_SELINUX),true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX -endif +LOCAL_STATIC_LIBRARIES := libselinux LOCAL_MODULE := libminzip |