diff options
| author | Jin Qian <jinqian@google.com> | 2017-05-08 20:50:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-08 20:50:27 +0000 |
| commit | 6f4b7b6b15cb6e22d14d2f4306d8520e62b03f53 (patch) | |
| tree | ddf6f0a23724f1e6b3412683dc9cd8d62b37c84c | |
| parent | 93f3f631592dc62ccb6df9aee9533623789dfc26 (diff) | |
| parent | cef78a95c15fb525d143d685c65cb4deed6a5c38 (diff) | |
| download | f2fs-tools-6f4b7b6b15cb6e22d14d2f4306d8520e62b03f53.tar.gz | |
f2fs-tools: update android makefile after upgrading to 1.8.0 am: cb1d44227d am: 9c708503ba
am: cef78a95c1
Change-Id: If8c9e5d6e5d0b7ad3881d49576207079b3aa418c
| -rw-r--r-- | Android.mk | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -4,7 +4,8 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(HOST_OS),linux) # The versions depend on $(LOCAL_PATH)/VERSION -version_CFLAGS := -DF2FS_MAJOR_VERSION=1 -DF2FS_MINOR_VERSION=4 -DF2FS_TOOLS_VERSION=\"1.4.0\" -DF2FS_TOOLS_DATE=\"2014-10-18\" +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) # external/e2fsprogs/lib is needed for uuid/uuid.h common_C_INCLUDES := $(LOCAL_PATH)/include external/e2fsprogs/lib/ @@ -18,7 +19,7 @@ LOCAL_SRC_FILES := \ mkfs/f2fs_format_utils.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/mkfs include $(BUILD_STATIC_LIBRARY) @@ -31,7 +32,7 @@ LOCAL_SRC_FILES := \ mkfs/f2fs_format_utils.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/mkfs include $(BUILD_HOST_STATIC_LIBRARY) @@ -40,10 +41,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := libf2fs_fmt_host_dyn LOCAL_SRC_FILES := \ lib/libf2fs.c \ + lib/libf2fs_io.c \ mkfs/f2fs_format.c \ + mkfs/f2fs_format_utils.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/mkfs LOCAL_STATIC_LIBRARIES := \ libf2fs_ioutils_host \ @@ -67,7 +70,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ mkfs/f2fs_format_main.c LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_STATIC_LIBRARIES := libc libf2fs_fmt libext2_uuid LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) @@ -80,7 +83,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ mkfs/f2fs_format_main.c LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_STATIC_LIBRARIES := libf2fs_fmt LOCAL_SHARED_LIBRARIES := libext2_uuid LOCAL_SYSTEM_SHARED_LIBRARIES := libc @@ -100,7 +103,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_SHARED_LIBRARIES := libext2_uuid LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_MODULE_TAGS := optional @@ -118,7 +121,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(version_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_HOST_SHARED_LIBRARIES := libext2_uuid include $(BUILD_HOST_EXECUTABLE) |