diff options
| author | Kenny Root <kroot@google.com> | 2012-10-17 01:33:39 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-17 01:33:40 +0200 |
| commit | 78afed1c15989d4aa7e66094afa81cd3a6d22674 (patch) | |
| tree | 0462d8372a28cd14dc5a2389b25500687e7950c9 /Android.mk | |
| parent | Merge "Fixing trivial warnings for libminui" (diff) | |
| parent | Remove HAVE_SELINUX guards (diff) | |
| download | android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar.gz android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar.bz2 android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar.lz android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar.xz android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.tar.zst android_bootable_recovery-78afed1c15989d4aa7e66094afa81cd3a6d22674.zip | |
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index 1c78b4287..cd368a006 100644 --- a/Android.mk +++ b/Android.mk @@ -46,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \ libpixelflinger_static \ libpng \ libcutils \ + libselinux \ libstdc++ \ libc @@ -55,12 +56,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. @@ -73,12 +68,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) |