diff options
| author | Matt Mower <mowerm@gmail.com> | 2017-01-18 04:14:46 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2017-01-18 19:40:26 +0100 |
| commit | 874136434a6ef13dffec9c6c8c136d2424a32c33 (patch) | |
| tree | 5875f18cd9ea090a36b692de24f29e69a2b4f65d /Android.mk | |
| parent | Restore file system type logline on restore (diff) | |
| download | android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.gz android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.bz2 android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.lz android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.xz android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.tar.zst android_bootable_recovery-874136434a6ef13dffec9c6c8c136d2424a32c33.zip | |
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/Android.mk b/Android.mk index 80d708141..dc557f4e8 100644 --- a/Android.mk +++ b/Android.mk @@ -159,25 +159,16 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) #LOCAL_STATIC_LIBRARIES += liblz4 endif endif -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 ($(TWHAVE_SELINUX), true) - LOCAL_C_INCLUDES += external/libselinux/include - LOCAL_SHARED_LIBRARIES += libselinux - LOCAL_CFLAGS += -DHAVE_SELINUX - ifneq ($(TARGET_USERIMAGES_USE_EXT4), true) - LOCAL_CFLAGS += -DUSE_EXT4 - LOCAL_C_INCLUDES += system/extras/ext4_utils - LOCAL_SHARED_LIBRARIES += libext4_utils - ifneq ($(wildcard external/lz4/Android.mk),) - LOCAL_STATIC_LIBRARIES += liblz4 - endif + +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_CFLAGS += -g +ifneq ($(TARGET_USERIMAGES_USE_EXT4), true) + LOCAL_CFLAGS += -DUSE_EXT4 + LOCAL_C_INCLUDES += system/extras/ext4_utils + LOCAL_SHARED_LIBRARIES += libext4_utils + ifneq ($(wildcard external/lz4/Android.mk),) + LOCAL_STATIC_LIBRARIES += liblz4 endif endif @@ -509,10 +500,8 @@ endif # If busybox does not have restorecon, assume it does not have SELinux support. # Then, let toolbox provide 'ls' so -Z is available to list SELinux contexts. -ifeq ($(TWHAVE_SELINUX), true) - ifeq ($(filter restorecon, $(notdir $(BUSYBOX_LINKS))),) - exclude += ls - endif +ifeq ($(filter restorecon, $(notdir $(BUSYBOX_LINKS))),) + exclude += ls endif RECOVERY_BUSYBOX_TOOLS := $(filter-out $(exclude), $(notdir $(BUSYBOX_LINKS))) |