diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2012-01-13 13:59:51 +0100 |
|---|---|---|
| committer | Stephen Smalley <sds@tycho.nsa.gov> | 2012-01-24 21:16:31 +0100 |
| commit | 1a114494950d8bce01bb860cd8a7221fdc9593cc (patch) | |
| tree | c78a22b97f26c97045c44b64a018e00c97a3c526 | |
| parent | Reconcile with ics-mr1-release (diff) | |
| download | android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar.gz android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar.bz2 android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar.lz android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar.xz android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.tar.zst android_bootable_recovery-1a114494950d8bce01bb860cd8a7221fdc9593cc.zip | |
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | updater/Android.mk | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 282862fc9..304626e5f 100644 --- a/Android.mk +++ b/Android.mk @@ -24,6 +24,11 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += libext4_utils libz +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_STATIC_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX endif # This binary is in the recovery ramdisk, which is otherwise a copy of root. @@ -43,6 +48,12 @@ LOCAL_STATIC_LIBRARIES += libminzip libunz libmtdutils libmincrypt LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils LOCAL_STATIC_LIBRARIES += libstdc++ libc +ifeq ($(HAVE_SELINUX),true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_STATIC_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + LOCAL_C_INCLUDES += system/extras/ext4_utils include $(BUILD_EXECUTABLE) diff --git a/updater/Android.mk b/updater/Android.mk index 8d731db3e..2c51f9990 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -22,6 +22,11 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += libext4_utils libz +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_STATIC_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX endif LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) |