diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
| commit | f25e7804729d25bcfde575b78b501e06a8cbb708 (patch) | |
| tree | d98e3220a7522671e6ce82a2d40bf878dfa3eccc /Android.mk | |
| parent | 5668a2234ad79ffd45838679692d10236a3e965f (diff) | |
| parent | 4f5a66a6eb77baa896d3adfb12139a830573f609 (diff) | |
| download | android_external_f2fs-tools-stable/cm-11.0-XNF9X.tar.gz android_external_f2fs-tools-stable/cm-11.0-XNF9X.tar.bz2 android_external_f2fs-tools-stable/cm-11.0-XNF9X.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Conflicts:
Android.mk
VERSION
fsck/dump.c
fsck/f2fs.h
fsck/fsck.c
fsck/main.c
fsck/mount.c
include/f2fs_fs.h
include/f2fs_version.h
lib/libf2fs.c
mkfs/Makefile.am
mkfs/f2fs_format.c
mkfs/f2fs_format_utils.c
mkfs/f2fs_format_utils.h
tools/f2fstat.c
tools/fibmap.c
Change-Id: I5cc044a6fe47bac6cab8d845f8d63729f765de50
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,7 +1,9 @@ LOCAL_PATH:= $(call my-dir) +LOCAL_CFLAGS := -DANDROID + include $(CLEAR_VARS) -LOCAL_SRC_FILES := mkfs/f2fs_format.c mkfs/f2fs_format_utils.c lib/libf2fs.c +LOCAL_SRC_FILES := mkfs/f2fs_format.c mkfs/f2fs_format_main.c mkfs/f2fs_format_utils.c lib/libf2fs.c lib/libf2fs_io.c LOCAL_MODULE := libmake_f2fs LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) @@ -15,7 +17,7 @@ LOCAL_STATIC_LIBRARIES := libmake_f2fs libcutils liblog libc include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_SRC_FILES := fsck/main.c fsck/fsck.c fsck/dump.c fsck/mount.c lib/libf2fs.c +LOCAL_SRC_FILES := fsck/main.c fsck/fsck.c fsck/dump.c fsck/mount.c lib/libf2fs.c lib/libf2fs_io.c LOCAL_MODULE := libfsck_f2fs LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) |