diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-04-15 19:16:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 19:16:35 +0000 |
| commit | a8c010bfb047e93d5ab3cf42ced60b2e8371f82f (patch) | |
| tree | b35d71b3c4d7ec0091b2266a2d8a0a13cac593a2 | |
| parent | bc49db0d0cdf9a1c747245bc13a2267fe8d33fc4 (diff) | |
| parent | 81c39be5ecdc37c32439c9b7d078be182505a34e (diff) | |
| download | extras-a8c010bfb047e93d5ab3cf42ced60b2e8371f82f.tar.gz | |
am 81c39be5: Merge "make_ext4fs: use libcutils and libselinux shared libraries"
* commit '81c39be5ecdc37c32439c9b7d078be182505a34e':
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 352e7424..08088863 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -34,15 +34,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) @@ -109,9 +109,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) |