diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-12-03 20:15:03 -0700 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-12-03 20:15:03 -0700 |
| commit | bd823f6dad0da10f42083c730e46e0d3b46c905c (patch) | |
| tree | e5824a72832f5e9bcf7eb5ed9df86e2d28ae9e10 | |
| parent | 3aac42adecad3abc82e62694bc231b5610e1c6c4 (diff) | |
| parent | db19512390ebdea5cf6fb18ddf1f08619fb5ded2 (diff) | |
| download | android_external_f2fs-tools-lineage-15.1.tar.gz android_external_f2fs-tools-lineage-15.1.tar.bz2 android_external_f2fs-tools-lineage-15.1.zip | |
Merge tag 'android-8.1.0_r52' into staging/lineage-15.1_merge-android-8.1.0_r52lineage-15.1
Android 8.1.0 release 52
* tag 'android-8.1.0_r52':
[DO NOT MERGE] make_f2fs: issue discard commands on mkfs
Change-Id: I7ca3b4f27e4b9af83b97e8c45ee978c49cb3eb02
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | Android.mk | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -8,6 +8,7 @@ cc_defaults { "-DF2FS_TOOLS_VERSION=\"1.11.0\"", "-DF2FS_TOOLS_DATE=\"2018-07-10\"", "-DWITH_ANDROID", + "-DWITH_BLKDISCARD", "-Wall", "-Werror", "-Wno-format", @@ -37,6 +38,7 @@ cc_defaults { name: "libf2fs_src_files", srcs: [ "lib/libf2fs.c", + "lib/libf2fs_zoned.c", "mkfs/f2fs_format.c", "mkfs/f2fs_format_utils.c", ], @@ -66,6 +68,7 @@ cc_defaults { "fsck/mount.c", "lib/libf2fs.c", "lib/libf2fs_io.c", + "lib/libf2fs_zoned.c", ], } @@ -198,6 +201,7 @@ cc_library_static { srcs: [ "lib/libf2fs.c", "lib/libf2fs_io.c", + "lib/libf2fs_zoned.c", ], } @@ -5,7 +5,7 @@ ifneq (,$filter linux darwin,$(HOST_OS)) # The versions depend on $(LOCAL_PATH)/VERSION version_CFLAGS := -DF2FS_MAJOR_VERSION=1 -DF2FS_MINOR_VERSION=11 -DF2FS_TOOLS_VERSION=\"1.11.0\" -DF2FS_TOOLS_DATE=\"2018-07-10\" -common_CFLAGS := -DWITH_ANDROID $(version_CFLAGS) \ +common_CFLAGS := -DWITH_ANDROID -DWITH_BLKDISCARD $(version_CFLAGS) \ -Wall -Werror \ -Wno-format \ -Wno-macro-redefined \ @@ -67,7 +67,8 @@ LOCAL_SRC_FILES := \ fsck/main.c \ fsck/mount.c \ lib/libf2fs.c \ - lib/libf2fs_io.c + lib/libf2fs_io.c \ + lib/libf2fs_zoned.c LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_CFLAGS := $(common_CFLAGS) -DWITH_SLOAD LOCAL_STATIC_LIBRARIES := \ |