diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-04-15 18:14:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-15 18:14:37 +0000 |
| commit | 81c39be5ecdc37c32439c9b7d078be182505a34e (patch) | |
| tree | 8aa217a52895b44f7f9ad0cfaf425305711b8edf | |
| parent | d16419e176efa26f1760a52a9b57df96d070147a (diff) | |
| parent | 34d15aaf2f8d8690d215996bd6e11d2f5c8b4e63 (diff) | |
| download | extras-81c39be5ecdc37c32439c9b7d078be182505a34e.tar.gz | |
Merge "make_ext4fs: use libcutils and libselinux shared libraries"
| -rw-r--r-- | ext4_utils/Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index 9f56ccad..27b00bf9 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -35,15 +35,15 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := make_ext4fs_main.c canned_fs_config.c LOCAL_MODULE := make_ext4fs +LOCAL_SHARED_LIBRARIES += libcutils LOCAL_STATIC_LIBRARIES += \ - libcutils \ libext4_utils_host \ libsparse_host \ libz ifeq ($(HOST_OS),windows) LOCAL_LDLIBS += -lws2_32 else - LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_SHARED_LIBRARIES += libselinux LOCAL_CFLAGS := -DHOST endif include $(BUILD_HOST_EXECUTABLE) @@ -106,9 +106,10 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := ext2simg.c LOCAL_MODULE := ext2simg +LOCAL_SHARED_LIBRARIES += \ + libselinux LOCAL_STATIC_LIBRARIES += \ libext4_utils_host \ - libselinux \ libsparse_host \ libz include $(BUILD_HOST_EXECUTABLE) |