diff options
| author | Kenny Root <kroot@google.com> | 2012-03-30 20:48:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-03-30 21:26:01 -0700 |
| commit | 41dda82d847ae8c261b09c383806b412d680f935 (patch) | |
| tree | 98edeec4fa5d9df2d0104624d66b1608cecdaf50 /Android.mk | |
| parent | b2364342a05a689bc302bfcd7d5d15f528eb772c (diff) | |
| parent | 0b1fee1b2aa7da86ffdabfe4c577ee8adb93d803 (diff) | |
| download | bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.zip bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.gz bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.bz2 | |
resolved conflicts for merge of 0b1fee1b to master
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -28,6 +28,12 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += libext4_utils libz endif +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_STATIC_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + # This binary is in the recovery ramdisk, which is otherwise a copy of root. # It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses # a (redundant) copy of the binary in /system/bin for user builds. @@ -45,6 +51,12 @@ LOCAL_STATIC_LIBRARIES += libminzip libz libmtdutils libmincrypt libminadbd 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) |