summaryrefslogtreecommitdiff
path: root/ext4_utils
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-02 20:59:05 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-02 20:59:05 +0000
commite32674213dc5ad2375423e43b3f2419ead19f568 (patch)
tree0e3217bbb0badb0f25a95df965ffbec7dd722279 /ext4_utils
parent0dbb7d33082ac3f12d2422d9af941f34686028e4 (diff)
parent19cc2a5891fb3c74d7ad4e4458f57008d2a774b9 (diff)
downloadextras-e32674213dc5ad2375423e43b3f2419ead19f568.tar.gz
Merge "ext4_utils: move fs_config to libcutils"
Diffstat (limited to 'ext4_utils')
-rw-r--r--ext4_utils/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index 76dd4534..9f56ccad 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -36,6 +36,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := make_ext4fs_main.c canned_fs_config.c
LOCAL_MODULE := make_ext4fs
LOCAL_STATIC_LIBRARIES += \
+ libcutils \
libext4_utils_host \
libsparse_host \
libz
@@ -64,10 +65,10 @@ LOCAL_SRC_FILES := $(libext4_utils_src_files)
LOCAL_MODULE := libext4_utils
LOCAL_C_INCLUDES += system/core/logwrapper/include
LOCAL_SHARED_LIBRARIES := \
+ libcutils \
libselinux \
libsparse \
- libz \
- libcutils
+ libz
include $(BUILD_SHARED_LIBRARY)
@@ -84,6 +85,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := make_ext4fs_main.c canned_fs_config.c
LOCAL_MODULE := make_ext4fs
LOCAL_SHARED_LIBRARIES := \
+ libcutils \
libext4_utils \
libselinux \
libz