diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
| commit | cd74108cdac228e946ca8b6ea2ff11ab62941a6d (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /Android.mk | |
| parent | d0d4d44d344779e59ee196637bbc745d68d70677 (diff) | |
| parent | 78afed1c15989d4aa7e66094afa81cd3a6d22674 (diff) | |
| download | bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.zip bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.gz bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.bz2 | |
resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 1 insertions, 12 deletions
@@ -46,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \ libpixelflinger_static \ libpng \ libcutils \ + libselinux \ libstdc++ \ libm \ libc @@ -56,12 +57,6 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_STATIC_LIBRARIES += libext4_utils_static 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. @@ -74,12 +69,6 @@ else LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) endif -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) |