aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2017-01-11 14:40:43 -0800
committerTheodore Ts'o <tytso@mit.edu>2017-05-23 22:58:48 -0400
commit145b22f9971869b37da94549a14437d047ea1f4e (patch)
treefee739a5a30ee9f9a6525c2e8a0505cb6aaae888 /lib
parenta5d3c5ba686cfeb21d1d679f7ca2dc8f09748b75 (diff)
downloade2fsprogs-145b22f9971869b37da94549a14437d047ea1f4e.tar.gz
AOSP: Remove "_host" and "_static" suffix from libsparse.
Bug: 34220783 Change-Id: I218ab40f423bf0bddebc3b2e1526bd9e3549eed6 From AOSP commit: 92d281bd3145e149d7330272b1704d77191482c4 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'lib')
-rw-r--r--lib/ext2fs/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 047b86702..2ccbb5964 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -116,7 +116,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
-LOCAL_STATIC_LIBRARIES := $(libext2fs_static_libraries) $(libext2fs_system_static_libraries) libsparse_static libz
+LOCAL_STATIC_LIBRARIES := $(libext2fs_static_libraries) $(libext2fs_system_static_libraries) libsparse libz
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
@@ -129,7 +129,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_WHOLE_STATIC_LIBRARIES := libext2_com_err-host
-LOCAL_STATIC_LIBRARIES := libsparse_host libz
+LOCAL_STATIC_LIBRARIES := libsparse libz
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags)
@@ -145,7 +145,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_WHOLE_STATIC_LIBRARIES := libext2_com_err-host
-LOCAL_STATIC_LIBRARIES := libsparse_host libz
+LOCAL_STATIC_LIBRARIES := libsparse libz
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)