diff options
| author | Kenny Root <kroot@google.com> | 2012-04-08 11:23:01 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-04-08 11:23:06 -0700 |
| commit | 78c43b51a4d052fda6648024c60eaf5bc67dfc5d (patch) | |
| tree | cd9eb8ceb4f2343502868d6f6818b86cf5ff3ebf | |
| parent | fc0f84928593f518cb01ee09f077ffd0b28ba6f2 (diff) | |
| download | extras-78c43b51a4d052fda6648024c60eaf5bc67dfc5d.tar.gz | |
Fix SELinux building
A bad merge and some new features caused SELinux not to build on
top-of-tree master. Some changes the Makefile restore its ability to
build.
Change-Id: Id60b89538beff33f1d8b436b5b7854d3eaa00069
| -rw-r--r-- | ext4_utils/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index d12a6be5..5dae31f2 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += external/zlib ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_STATIC_LIBRARIES += libselinux LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX @@ -40,6 +40,10 @@ LOCAL_MODULE := make_ext4fs LOCAL_STATIC_LIBRARIES += libext4_utils libz ifeq ($(HOST_OS),windows) LOCAL_LDLIBS += -lws2_32 +else +ifeq ($(HAVE_SELINUX), true) +LOCAL_STATIC_LIBRARIES += libselinux +endif # HAVE_SELINUX endif include $(BUILD_HOST_EXECUTABLE) |