summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Android.mk8
-rw-r--r--libtar/Android.mk2
-rw-r--r--minzip/Android.mk2
-rw-r--r--prebuilt/Android.mk2
4 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 4cee5c7cb..8fc99b2ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,13 +79,15 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_SHARED_LIBRARIES += libext4_utils
endif
-
-ifeq ($(HAVE_SELINUX), true)
+ifneq ($(wildcard external/libselinux/Android.mk),)
+ TWHAVE_SELINUX := true
+endif
+ifeq ($(TWHAVE_SELINUX), true)
#LOCAL_C_INCLUDES += external/libselinux/include
#LOCAL_STATIC_LIBRARIES += libselinux
#LOCAL_CFLAGS += -DHAVE_SELINUX -g
endif # HAVE_SELINUX
-ifeq ($(HAVE_SELINUX), true)
+ifeq ($(TWHAVE_SELINUX), true)
LOCAL_C_INCLUDES += external/libselinux/include
LOCAL_SHARED_LIBRARIES += libselinux
LOCAL_CFLAGS += -DHAVE_SELINUX -g
diff --git a/libtar/Android.mk b/libtar/Android.mk
index 9070f7033..f936e96ff 100644
--- a/libtar/Android.mk
+++ b/libtar/Android.mk
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \
external/zlib
LOCAL_SHARED_LIBRARIES += libz libc
-ifeq ($(HAVE_SELINUX), true)
+ifeq ($(TWHAVE_SELINUX), true)
LOCAL_C_INCLUDES += external/libselinux/include
LOCAL_SHARED_LIBRARIES += libselinux
LOCAL_CFLAGS += -DHAVE_SELINUX
diff --git a/minzip/Android.mk b/minzip/Android.mk
index 3dd97ff04..68485abe1 100644
--- a/minzip/Android.mk
+++ b/minzip/Android.mk
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
external/zlib \
external/safe-iop/include
-ifeq ($(HAVE_SELINUX),true)
+ifeq ($(TWHAVE_SELINUX),true)
LOCAL_C_INCLUDES += external/libselinux/include
LOCAL_STATIC_LIBRARIES += libselinux
LOCAL_CFLAGS += -DHAVE_SELINUX
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 08e09aca7..0169fb89d 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -51,7 +51,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libaosprecovery.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libjpeg.so
-ifeq ($(HAVE_SELINUX), true)
+ifeq ($(TWHAVE_SELINUX), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libselinux.so
ifneq ($(TARGET_USERIMAGES_USE_EXT4), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so