diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-23 19:15:37 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2012-08-15 19:52:53 -0700 |
| commit | c40049baae4bf58e201a1f8f8bb715c4eee2c45b (patch) | |
| tree | 91d66291cf8a659a18fdb442d43c8403ffad420a | |
| parent | 3f1eb9962d18db7ea23fdc5d3b0b52707fb53b06 (diff) | |
| download | extras-c40049baae4bf58e201a1f8f8bb715c4eee2c45b.tar.gz | |
Support for multiple modules with the same name is going away.
Change-Id: I4e94b8b9cc7c88e07e8a09abc26a3e7d495ac5be
| -rw-r--r-- | ext4_utils/Android.mk | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index 6c517c99..99145a4a 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -22,7 +22,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) LOCAL_MODULE := libext4_utils_host LOCAL_C_INCLUDES += external/zlib -LOCAL_STATIC_LIBRARIES += libsparse +LOCAL_STATIC_LIBRARIES += libsparse_host ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include LOCAL_STATIC_LIBRARIES += libselinux @@ -34,7 +34,10 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := make_ext4fs_main.c LOCAL_MODULE := make_ext4fs -LOCAL_STATIC_LIBRARIES += libext4_utils_host libsparse libz +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz ifeq ($(HOST_OS),windows) LOCAL_LDLIBS += -lws2_32 else @@ -57,7 +60,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) LOCAL_MODULE := libext4_utils LOCAL_C_INCLUDES += external/zlib -LOCAL_SHARED_LIBRARIES := libsparse libz +LOCAL_SHARED_LIBRARIES := \ + libsparse \ + libz ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include LOCAL_SHARED_LIBRARIES += libselinux @@ -70,7 +75,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext4_utils_src_files) LOCAL_MODULE := libext4_utils_static LOCAL_C_INCLUDES += external/zlib -LOCAL_STATIC_LIBRARIES += libsparse +LOCAL_STATIC_LIBRARIES += \ + libsparse_static ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include LOCAL_STATIC_LIBRARIES += libselinux @@ -94,7 +100,10 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := ext2simg.c LOCAL_MODULE := ext2simg -LOCAL_SHARED_LIBRARIES += libext4_utils_host libsparse libz +LOCAL_SHARED_LIBRARIES += \ + libext4_utils \ + libsparse \ + libz ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include LOCAL_SHARED_LIBRARIES += libselinux @@ -106,7 +115,10 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := ext2simg.c LOCAL_MODULE := ext2simg -LOCAL_STATIC_LIBRARIES += libext4_utils_host libsparse libz +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz ifeq ($(HAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include LOCAL_STATIC_LIBRARIES += libselinux @@ -125,14 +137,20 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := ext4fixup_main.c LOCAL_MODULE := ext4fixup -LOCAL_SHARED_LIBRARIES += libext4_utils libsparse libz +LOCAL_SHARED_LIBRARIES += \ + libext4_utils \ + libsparse \ + libz include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := ext4fixup_main.c LOCAL_MODULE := ext4fixup -LOCAL_STATIC_LIBRARIES += libext4_utils_host libsparse libz +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_host \ + libsparse_host \ + libz include $(BUILD_HOST_EXECUTABLE) |