diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-19 16:24:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-19 16:24:40 +0000 |
| commit | db19512390ebdea5cf6fb18ddf1f08619fb5ded2 (patch) | |
| tree | ea02b60dc25a68ffaddc5f34bfd20c98fc4c0505 | |
| parent | d46422c8472fa440b4e4591389da95055eb453c1 (diff) | |
| parent | 2ccffef1cd2890a114f9f3de2c8e6cfb7189c2b3 (diff) | |
| download | f2fs-tools-oreo-m7-release.tar.gz | |
Merge cherrypicks of [5313339, 5313437, 5313318, 5313340, 5313282, 5313283, 5313438, 5313284, 5313341, 5313379, 5313380, 5313319, 5313320, 5313321, 5313285, 5313286, 5313287, 5313497, 5313439] into oc-m7-releaseandroid-8.1.0_r52oreo-m7-release
Change-Id: Iba8158da343d5af59b673e4723d9d0a0ce9717ba
| -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 \ |