diff options
| author | Alex Deymo <deymo@google.com> | 2017-01-12 21:32:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 21:32:41 +0000 |
| commit | 2b89372afa7c8746bae75084fed2a2728425c1bb (patch) | |
| tree | 9d1d304b6f94b0432f59ae5aea42911c6c1a29b4 | |
| parent | c1debb2e9a6f9d628ade4db8c8a6184936c8f181 (diff) | |
| parent | 7d95329bf0c355dec16a89a173241f164c8eefa5 (diff) | |
| download | e2fsprogs-2b89372afa7c8746bae75084fed2a2728425c1bb.tar.gz | |
Merge "Remove "_host" and "_static" suffix from libsparse." am: 22aabbe13b
am: 7d95329bf0
Change-Id: Ieb969d6353c3ac9f33e65d220f7cb1c67ca3791b
| -rw-r--r-- | contrib/android/Android.mk | 2 | ||||
| -rw-r--r-- | lib/ext2fs/Android.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk index abe628bc..bc968fae 100644 --- 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 047b8670..2ccbb596 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) |