diff options
| author | Kenny Root <kroot@google.com> | 2012-03-30 20:38:32 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-03-30 21:25:48 -0700 |
| commit | 2e5c52322d54d0f98d36b499fcaa31a0e84ca87c (patch) | |
| tree | 2c33fab44952f4a63d0c292596f2e14f439005fc /ext4_utils/Android.mk | |
| parent | 68e3dfd81ddb9367a0c3e0c72148c23a3227ed48 (diff) | |
| parent | 8f9b41d95594af0bdafd4f3c22e9e1968ac7342c (diff) | |
| download | extras-2e5c52322d54d0f98d36b499fcaa31a0e84ca87c.tar.gz | |
resolved conflicts for merge of 8f9b41d9 to master
Change-Id: I9af02b9bba1176174540c849f905dece8ade54d8
Diffstat (limited to 'ext4_utils/Android.mk')
| -rw-r--r-- | ext4_utils/Android.mk | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index ceb3bdbd..d12a6be5 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -25,6 +25,12 @@ LOCAL_MODULE := libext4_utils LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += external/zlib +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -50,6 +56,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += external/zlib LOCAL_SHARED_LIBRARIES := libz +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -59,6 +71,12 @@ LOCAL_MODULE := libext4_utils LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += external/zlib +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_STATIC_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -68,6 +86,12 @@ LOCAL_MODULE := make_ext4fs LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES += libext4_utils libz +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -77,6 +101,12 @@ LOCAL_MODULE := ext2simg LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES += libext4_utils libz +ifeq ($(HAVE_SELINUX), true) +LOCAL_C_INCLUDES += external/libselinux/include +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_CFLAGS += -DHAVE_SELINUX +endif # HAVE_SELINUX + include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -86,6 +116,12 @@ LOCAL_MODULE := ext2simg LOCAL_MODULE_TAGS := optional 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 + include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) |