[DO NOT MERGE] make_f2fs: issue discard commands on mkfs

We'd better to discard whole partition for better performance.

Bug: 112868088
Test: factory reset
Change-Id: I9c0c711f2b081e4d0b4e145ab08f95b382925847
Merged-In: I9c0c711f2b081e4d0b4e145ab08f95b382925847
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit 7d37f592ac632ba415d3953eef0e8621c456b73c)
diff --git a/Android.mk b/Android.mk
index 38fce50..d4f19cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@
 
 # 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 @@
 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 @@
 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 @@
 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 \