diff options
| author | Kenny Root <kroot@google.com> | 2012-10-17 02:49:23 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 02:49:23 +0200 |
| commit | a0d9ddb8f2922088b08219326afeaf532b3af5ac (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /Android.mk | |
| parent | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff) | |
| parent | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp (diff) | |
| download | android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.gz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.bz2 android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.lz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.xz android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.zst android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.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 215cfe569..f4ecdb5dd 100644 --- a/Android.mk +++ b/Android.mk @@ -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) |