summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--prebuilt/Android.mk5
2 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 9ef4e67bd..4a2238c3f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,7 +73,7 @@ ifeq ($(HAVE_SELINUX), true)
#LOCAL_STATIC_LIBRARIES += libselinux
#LOCAL_CFLAGS += -DHAVE_SELINUX -g
endif # HAVE_SELINUX
-ifneq ($(wildcard external/libselinux/Android.mk),)
+ifeq ($(HAVE_SELINUX), true)
LOCAL_C_INCLUDES += external/libselinux/include
LOCAL_SHARED_LIBRARIES += libselinux
LOCAL_CFLAGS += -DHAVE_SELINUX -g
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 39f702b3d..73432b3cb 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -51,8 +51,11 @@ 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
-ifneq ($(wildcard external/libselinux/Android.mk),)
+ifeq ($(HAVE_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
+ endif
endif
ifeq ($(BUILD_ID), GINGERBREAD)
TW_NO_EXFAT := true