diff options
| author | Elliott Hughes <enh@google.com> | 2017-05-18 09:53:44 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-05-18 09:53:44 -0700 |
| commit | 6bd9b2940d117c5b65d3a7a9b24b6055d085c1c9 (patch) | |
| tree | fe88490296a35f355a3294be6ef2d35c9fecc4d2 | |
| parent | cb1d44227d9b86165a1e5d5b6beeb7afbfda3846 (diff) | |
| download | f2fs-tools-6bd9b2940d117c5b65d3a7a9b24b6055d085c1c9.tar.gz | |
Adjust f2fs makefile to cope with <sys/sysmacros.h> split.
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: Ifc4892f09a32bda246bdf60cd9864d43f06028d4
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -6,6 +6,9 @@ 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) +# 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 # external/e2fsprogs/lib is needed for uuid/uuid.h common_C_INCLUDES := $(LOCAL_PATH)/include external/e2fsprogs/lib/ @@ -19,7 +22,7 @@ LOCAL_SRC_FILES := \ mkfs/f2fs_format_utils.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(common_CFLAGS) +LOCAL_CFLAGS := $(target_CFLAGS) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/mkfs include $(BUILD_STATIC_LIBRARY) @@ -70,7 +73,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ mkfs/f2fs_format_main.c LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(common_CFLAGS) +LOCAL_CFLAGS := $(target_CFLAGS) LOCAL_STATIC_LIBRARIES := libc libf2fs_fmt libext2_uuid LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) @@ -83,7 +86,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ mkfs/f2fs_format_main.c LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(common_CFLAGS) +LOCAL_CFLAGS := $(target_CFLAGS) LOCAL_STATIC_LIBRARIES := libf2fs_fmt LOCAL_SHARED_LIBRARIES := libext2_uuid LOCAL_SYSTEM_SHARED_LIBRARIES := libc @@ -103,7 +106,7 @@ LOCAL_SRC_FILES := \ lib/libf2fs_io.c \ LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_CFLAGS := $(common_CFLAGS) +LOCAL_CFLAGS := $(target_CFLAGS) LOCAL_SHARED_LIBRARIES := libext2_uuid LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_MODULE_TAGS := optional |