summaryrefslogtreecommitdiffstats
path: root/updater/Android.mk
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-10-17 02:49:23 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-17 02:49:23 +0200
commita0d9ddb8f2922088b08219326afeaf532b3af5ac (patch)
treec657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /updater/Android.mk
parentam d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff)
parentresolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp (diff)
downloadandroid_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 'updater/Android.mk')
-rw-r--r--updater/Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/updater/Android.mk b/updater/Android.mk
index 8876120b0..4271371e9 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -27,17 +27,12 @@ LOCAL_STATIC_LIBRARIES += \
libz
endif
-ifeq ($(HAVE_SELINUX), true)
-LOCAL_C_INCLUDES += external/libselinux/include
-LOCAL_STATIC_LIBRARIES += libselinux
-LOCAL_CFLAGS += -DHAVE_SELINUX
-endif # HAVE_SELINUX
-
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz
LOCAL_STATIC_LIBRARIES += libmincrypt libbz
LOCAL_STATIC_LIBRARIES += libminelf
LOCAL_STATIC_LIBRARIES += libcutils libstdc++ libc
+LOCAL_STATIC_LIBRARIES += libselinux
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
# Each library in TARGET_RECOVERY_UPDATER_LIBS should have a function