summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Mower <mowerm@gmail.com>2015-11-12 06:13:44 +0100
committerEthan Yonker <dees_troy@teamw.in>2015-12-22 21:34:13 +0100
commit231daef285386ae04f9999853edd2cbfcf64e275 (patch)
tree3b96f8055ee01514637ff380953546c4bbd27f0e
parentAppend AOSP recovery commands inline (diff)
downloadandroid_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar.gz
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar.bz2
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar.lz
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar.xz
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.tar.zst
android_bootable_recovery-231daef285386ae04f9999853edd2cbfcf64e275.zip
-rw-r--r--minzip/Android.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/minzip/Android.mk b/minzip/Android.mk
index 6cca09239..ad976e796 100644
--- a/minzip/Android.mk
+++ b/minzip/Android.mk
@@ -12,14 +12,18 @@ LOCAL_C_INCLUDES := \
external/zlib \
external/safe-iop/include
-LOCAL_STATIC_LIBRARIES := libselinux
+ifeq ($(TWHAVE_SELINUX),true)
+LOCAL_C_INCLUDES += external/libselinux/include
+LOCAL_SHARED_LIBRARIES += libselinux
+LOCAL_CFLAGS += -DHAVE_SELINUX
+endif
LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
LOCAL_MODULE := libminzip
LOCAL_CFLAGS += -Wall
-LOCAL_SHARED_LIBRARIES := libz
+LOCAL_SHARED_LIBRARIES += libz
include $(BUILD_SHARED_LIBRARY)
@@ -46,6 +50,6 @@ endif
LOCAL_MODULE := libminzip
LOCAL_CFLAGS += -Wall
-LOCAL_STATIC_LIBRARIES := libz
+LOCAL_STATIC_LIBRARIES += libz
include $(BUILD_STATIC_LIBRARY)