diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-11-29 00:36:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-11-29 00:36:28 +0000 |
| commit | e39841df5fac35b2dce84d6829afa867e074c1aa (patch) | |
| tree | ea02b60dc25a68ffaddc5f34bfd20c98fc4c0505 | |
| parent | 6e0551d320a0af905656df0e916c16ec52b0e96b (diff) | |
| parent | 6f136c2b81a43e94b3d30059f376baa99355aa09 (diff) | |
| download | f2fs-tools-oreo-mr1-iot-release.tar.gz | |
Merge cherrypicks of [5641180, 5641181, 5641214, 5640636, 5640228, 5640637, 5640638, 5641002, 5640969, 5640522, 5640232, 5640233, 5640922, 5641003] into oc-mr1-iot-releaseandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
Change-Id: I0349eb7b26f2aa7b780f7d76416ea292b8278222
| -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 \ |