Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a114494 authored by Stephen Smalley's avatar Stephen Smalley
Browse files

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
parent 9fc3e3c8

Android.mk

+11 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,11 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) 
LOCAL_CFLAGS += -DUSE_EXT4

LOCAL_CFLAGS += -DUSE_EXT4

LOCAL_C_INCLUDES += system/extras/ext4_utils

LOCAL_C_INCLUDES += system/extras/ext4_utils

LOCAL_STATIC_LIBRARIES += libext4_utils libz

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

endif





# This binary is in the recovery ramdisk, which is otherwise a copy of root.

# This binary is in the recovery ramdisk, which is otherwise a copy of root.
@@ -43,6 +48,12 @@ LOCAL_STATIC_LIBRARIES += libminzip libunz libmtdutils libmincrypt 
LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils

LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils

LOCAL_STATIC_LIBRARIES += libstdc++ libc

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

LOCAL_C_INCLUDES += system/extras/ext4_utils





include $(BUILD_EXECUTABLE)

include $(BUILD_EXECUTABLE)

updater/Android.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,11 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) 
LOCAL_CFLAGS += -DUSE_EXT4

LOCAL_CFLAGS += -DUSE_EXT4

LOCAL_C_INCLUDES += system/extras/ext4_utils

LOCAL_C_INCLUDES += system/extras/ext4_utils

LOCAL_STATIC_LIBRARIES += libext4_utils libz

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

endif





LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)

LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)