commit 8e6e5933bf7d75777e5e05c6d3eeaa2970020ca8
author Mark Salyzyn <salyzyn@google.com> Thu Apr 02 21:40:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 02 21:40:13 2015 +0000
tree b1883e347bcd2573df304dac05ac8de4b37ccbe8
parent 04b01d8c292e155a463f8f1898ff1a2ab7d634cd
parent e32674213dc5ad2375423e43b3f2419ead19f568

am e3267421: Merge "ext4_utils: move fs_config to libcutils"

* commit 'e32674213dc5ad2375423e43b3f2419ead19f568':
  ext4_utils: move fs_config to libcutils

ext4_utils/Android.mk

diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index 76dd453..9f56cca 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -36,6 +36,7 @@
 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_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 @@
 LOCAL_SRC_FILES := make_ext4fs_main.c canned_fs_config.c
 LOCAL_MODULE := make_ext4fs
 LOCAL_SHARED_LIBRARIES := \
+    libcutils \
     libext4_utils \
     libselinux \
     libz