diff options
| -rw-r--r-- | ext4_utils/Android.mk | 8 | ||||
| -rw-r--r-- | f2fs_utils/Android.mk | 8 | ||||
| -rw-r--r-- | verity/Android.mk | 4 | ||||
| -rw-r--r-- | verity/fec/Android.mk | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index fba8ab4d..4287650d 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -29,7 +29,7 @@ LOCAL_C_INCLUDES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ - libsparse_host + libsparse LOCAL_STATIC_LIBRARIES_darwin += libselinux LOCAL_STATIC_LIBRARIES_linux += libselinux LOCAL_MODULE_HOST_OS := darwin linux windows @@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES += libcutils LOCAL_STATIC_LIBRARIES += \ libext4_utils \ - libsparse_host \ + libsparse \ libz LOCAL_LDLIBS_windows += -lws2_32 LOCAL_SHARED_LIBRARIES_darwin += libselinux @@ -105,7 +105,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ liblogwrap \ - libsparse_static \ + libsparse \ libselinux \ libbase include $(BUILD_STATIC_LIBRARY) @@ -148,7 +148,7 @@ LOCAL_SRC_FILES := ext4fixup_main.c LOCAL_MODULE := ext4fixup LOCAL_STATIC_LIBRARIES += \ libext4_utils \ - libsparse_host \ + libsparse \ libz include $(BUILD_HOST_EXECUTABLE) diff --git a/f2fs_utils/Android.mk b/f2fs_utils/Android.mk index 82c3ee00..f643ad24 100644 --- a/f2fs_utils/Android.mk +++ b/f2fs_utils/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libf2fs_utils_host LOCAL_SRC_FILES := f2fs_utils.c LOCAL_STATIC_LIBRARIES := \ - libsparse_host \ + libsparse \ libz LOCAL_C_INCLUDES := external/f2fs-tools/include external/f2fs-tools/mkfs LOCAL_CFLAGS := -Wno-unused-parameter @@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := external/f2fs-tools/include external/f2fs-tools/mkfs LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_STATIC_LIBRARIES := \ libselinux \ - libsparse_host \ + libsparse \ libext2_uuid-host \ libz LOCAL_MODULE := libf2fs_ioutils_host @@ -44,7 +44,7 @@ LOCAL_LDFLAGS := -ldl -rdynamic LOCAL_STATIC_LIBRARIES := libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn LOCAL_STATIC_LIBRARIES += \ - libsparse_host \ + libsparse \ libz include $(BUILD_HOST_EXECUTABLE) @@ -68,7 +68,7 @@ LOCAL_SRC_FILES := f2fs_utils.c LOCAL_C_INCLUDES := external/f2fs-tools/include external/f2fs-tools/mkfs LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_STATIC_LIBRARIES := \ - libsparse_static + libsparse include $(BUILD_STATIC_LIBRARY) endif diff --git a/verity/Android.mk b/verity/Android.mk index a2e5db62..ddea3e2c 100644 --- a/verity/Android.mk +++ b/verity/Android.mk @@ -51,7 +51,7 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto_utils \ libcrypto \ libext4_utils \ - libsparse_host \ + libsparse \ libsquashfs_utils_host \ libbase \ libz @@ -88,7 +88,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := build_verity_tree LOCAL_SRC_FILES := build_verity_tree.cpp LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libsparse_host libz +LOCAL_STATIC_LIBRARIES := libsparse libz LOCAL_SHARED_LIBRARIES := libcrypto libbase LOCAL_CFLAGS += -Wall -Werror include $(BUILD_HOST_EXECUTABLE) diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk index ef4ad854..e5cd499b 100644 --- a/verity/fec/Android.mk +++ b/verity/fec/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE := fec LOCAL_SRC_FILES := main.cpp image.cpp LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := \ - libsparse_host \ + libsparse \ libz \ libcrypto_utils \ libcrypto \ |