diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-19 16:33:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-19 16:33:28 +0000 |
| commit | 2e51e9e28b5c2cd4b83b3b7ce03d958ba409a0bf (patch) | |
| tree | ea02b60dc25a68ffaddc5f34bfd20c98fc4c0505 | |
| parent | fa1e6af573a0f3ff912d7b0b1c0c544d60cf1746 (diff) | |
| parent | 5b5e965fc8e2210ece73ac4215969862798876d6 (diff) | |
| download | f2fs-tools-android-8.1.0_r63.tar.gz | |
Merge cherrypicks of [5313290, 5313323, 5313343, 5313415, 5313291, 5313441, 5313557, 5313344, 5313383, 5313384, 5313324, 5313325, 5313326, 5313294, 5313295, 5313296, 5313498] into oc-m8-releaseandroid-8.1.0_r67android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r53oreo-m8-release
Change-Id: Ib9ce3fbbbefb072a6598a024ce04e6646cfe2d59
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -5,7 +5,7 @@ ifeq ($(HOST_OS),linux) # The versions depend on $(LOCAL_PATH)/VERSION version_CFLAGS := -DF2FS_MAJOR_VERSION=1 -DF2FS_MINOR_VERSION=8 -DF2FS_TOOLS_VERSION=\"1.8.0\" -DF2FS_TOOLS_DATE=\"2017-02-03\" -common_CFLAGS := -DWITH_ANDROID $(version_CFLAGS) +common_CFLAGS := -DWITH_ANDROID -DWITH_BLKDISCARD $(version_CFLAGS) # Workaround for the <sys/types.h>/<sys/sysmacros.h> split, here now for # bionic and coming later for glibc. target_CFLAGS := $(common_CFLAGS) -include sys/sysmacros.h @@ -18,6 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libf2fs_fmt LOCAL_SRC_FILES := \ lib/libf2fs.c \ + lib/libf2fs_zoned.c \ mkfs/f2fs_format.c \ mkfs/f2fs_format_utils.c \ @@ -31,6 +32,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libf2fs_fmt_host LOCAL_SRC_FILES := \ lib/libf2fs.c \ + lib/libf2fs_zoned.c \ mkfs/f2fs_format.c \ mkfs/f2fs_format_utils.c \ @@ -44,6 +46,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libf2fs_fmt_host_dyn LOCAL_SRC_FILES := \ lib/libf2fs.c \ + lib/libf2fs_zoned.c \ lib/libf2fs_io.c \ mkfs/f2fs_format.c \ mkfs/f2fs_format_utils.c \ |