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>

diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
index abe628bc1ab208b6fd4a46c9c70148c492ed735a..bc968fae8441d519b9d5028bf2292617c6e3f00a 100644 (file)
--- a/contrib/android/Android.mk
+++ b/contrib/android/Android.mk
@@ -54,6 +54,6 @@ LOCAL_SHARED_LIBRARIES += \
     libext2fs-host \
     libext2_com_err-host
 LOCAL_STATIC_LIBRARIES += \
-    libsparse_host \
+    libsparse \
     libz
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 047b867023bad2bb0dae0f3c14f3150d2c03b2b7..2ccbb596414692d5c2f96feb2a577eb89a8da687 100644 (file)
--- 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)