commit 1a114494950d8bce01bb860cd8a7221fdc9593cc
author Stephen Smalley <sds@tycho.nsa.gov> Fri Jan 13 07:59:51 2012 -0500
committer Stephen Smalley <sds@tycho.nsa.gov> Tue Jan 24 15:16:31 2012 -0500
tree c78a22b97f26c97045c44b64a018e00c97a3c526
parent 9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa

Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.

libext4_utils now calls libselinux in order to determine the
file security context to set on files when creating ext4 images.

Change-Id: I09fb9d563d22ee106bf100eacd4cd9c6300b1152

Android.mk

diff --git a/Android.mk b/Android.mk
index 282862f..304626e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,11 @@
 LOCAL_CFLAGS += -DUSE_EXT4
 LOCAL_C_INCLUDES += system/extras/ext4_utils
 LOCAL_STATIC_LIBRARIES += libext4_utils libz
+ifeq ($(HAVE_SELINUX), true)
+LOCAL_C_INCLUDES += external/libselinux/include
+LOCAL_STATIC_LIBRARIES += libselinux
+LOCAL_CFLAGS += -DHAVE_SELINUX
+endif # HAVE_SELINUX
 endif
 
 # This binary is in the recovery ramdisk, which is otherwise a copy of root.
@@ -43,6 +48,12 @@
 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)

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index 8d731db..2c51f99 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -22,6 +22,11 @@
 LOCAL_CFLAGS += -DUSE_EXT4
 LOCAL_C_INCLUDES += system/extras/ext4_utils
 LOCAL_STATIC_LIBRARIES += libext4_utils libz
+ifeq ($(HAVE_SELINUX), true)
+LOCAL_C_INCLUDES += external/libselinux/include
+LOCAL_STATIC_LIBRARIES += libselinux
+LOCAL_CFLAGS += -DHAVE_SELINUX
+endif # HAVE_SELINUX
 endif
 
 LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)