mirror of https://github.com/vitalif/e2fsprogs
Update Android build files so the 1.43 branch builds on AOSP
Recent changes in the 1.43 branch as well as the latest AOSP caused the Android build to break; fix them. Signed-off-by: Theodore Ts'o <tytso@mit.edu>debian
parent
8beba812a9
commit
2df733facd
|
@ -47,3 +47,5 @@
|
||||||
# ************************************************
|
# ************************************************
|
||||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||||
# ************************************************
|
# ************************************************
|
||||||
|
|
||||||
|
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libext2_uuid_intermediates)
|
||||||
|
|
|
@ -69,7 +69,9 @@ e2fsck_src_files := \
|
||||||
rehash.c \
|
rehash.c \
|
||||||
region.c \
|
region.c \
|
||||||
sigcatcher.c \
|
sigcatcher.c \
|
||||||
plausible.c
|
plausible.c \
|
||||||
|
readahead.c \
|
||||||
|
extents.c
|
||||||
|
|
||||||
e2fsck_shared_libraries := \
|
e2fsck_shared_libraries := \
|
||||||
libext2fs \
|
libext2fs \
|
||||||
|
|
|
@ -6,6 +6,7 @@ libext2fs_src_files := \
|
||||||
alloc_sb.c \
|
alloc_sb.c \
|
||||||
alloc_stats.c \
|
alloc_stats.c \
|
||||||
alloc_tables.c \
|
alloc_tables.c \
|
||||||
|
atexit.c \
|
||||||
badblocks.c \
|
badblocks.c \
|
||||||
bb_inode.c \
|
bb_inode.c \
|
||||||
bitmaps.c \
|
bitmaps.c \
|
||||||
|
@ -42,6 +43,7 @@ libext2fs_src_files := \
|
||||||
getsectsize.c \
|
getsectsize.c \
|
||||||
i_block.c \
|
i_block.c \
|
||||||
icount.c \
|
icount.c \
|
||||||
|
imager.c \
|
||||||
ind_block.c \
|
ind_block.c \
|
||||||
initialize.c \
|
initialize.c \
|
||||||
inline.c \
|
inline.c \
|
||||||
|
@ -61,6 +63,7 @@ libext2fs_src_files := \
|
||||||
openfs.c \
|
openfs.c \
|
||||||
progress.c \
|
progress.c \
|
||||||
punch.c \
|
punch.c \
|
||||||
|
qcow2.c \
|
||||||
rbtree.c \
|
rbtree.c \
|
||||||
read_bb.c \
|
read_bb.c \
|
||||||
read_bb_file.c \
|
read_bb_file.c \
|
||||||
|
|
|
@ -13,9 +13,12 @@ libext2_quota_cflags := -O2 -g -W -Wall
|
||||||
|
|
||||||
libext2_quota_shared_libraries := libext2fs libext2_com_err
|
libext2_quota_shared_libraries := libext2fs libext2_com_err
|
||||||
|
|
||||||
|
libext2_quota_system_shared_libraries := libc
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(libext2_quota_src_files)
|
LOCAL_SRC_FILES := $(libext2_quota_src_files)
|
||||||
|
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_quota_system_shared_libraries)
|
||||||
LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
|
LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
|
||||||
LOCAL_CFLAGS := $(libext2_quota_cflags)
|
LOCAL_CFLAGS := $(libext2_quota_cflags)
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES := libc $(libext2_quota_shared_libraries)
|
LOCAL_SYSTEM_SHARED_LIBRARIES := libc $(libext2_quota_shared_libraries)
|
||||||
|
|
|
@ -24,6 +24,7 @@ include $(CLEAR_VARS)
|
||||||
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
||||||
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
||||||
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
||||||
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries)
|
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries)
|
||||||
LOCAL_MODULE := libext2_uuid
|
LOCAL_MODULE := libext2_uuid
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
@ -35,6 +36,7 @@ include $(CLEAR_VARS)
|
||||||
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
||||||
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
||||||
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
||||||
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
|
||||||
LOCAL_MODULE := libext2_uuid_host
|
LOCAL_MODULE := libext2_uuid_host
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
@ -46,6 +48,7 @@ include $(CLEAR_VARS)
|
||||||
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
||||||
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
||||||
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
||||||
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
|
||||||
LOCAL_STATIC_LIBRARIES := libc
|
LOCAL_STATIC_LIBRARIES := libc
|
||||||
LOCAL_MODULE := libext2_uuid_static
|
LOCAL_MODULE := libext2_uuid_static
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
@ -58,6 +61,7 @@ include $(CLEAR_VARS)
|
||||||
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
|
||||||
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
|
||||||
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
LOCAL_CFLAGS := $(libext2_uuid_cflags)
|
||||||
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
|
||||||
LOCAL_MODULE := libext2_uuid_host
|
LOCAL_MODULE := libext2_uuid_host
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
|
|
@ -299,3 +299,46 @@ LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
include $(BUILD_HOST_EXECUTABLE)
|
include $(BUILD_HOST_EXECUTABLE)
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# Build e2image
|
||||||
|
#
|
||||||
|
e2image_src_files := \
|
||||||
|
e2image.c \
|
||||||
|
plausible.c
|
||||||
|
|
||||||
|
e2image_c_includes := \
|
||||||
|
external/e2fsprogs/lib
|
||||||
|
|
||||||
|
e2image_cflags := -O2 -g -W -Wall
|
||||||
|
|
||||||
|
e2image_shared_libraries := \
|
||||||
|
libext2fs \
|
||||||
|
libext2_blkid \
|
||||||
|
libext2_com_err
|
||||||
|
|
||||||
|
e2image_system_shared_libraries := libc
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
LOCAL_SRC_FILES := $(e2image_src_files)
|
||||||
|
LOCAL_C_INCLUDES := $(e2image_c_includes)
|
||||||
|
mke2fs_c_includesLOCAL_CFLAGS := $(e2image_cflags)
|
||||||
|
LOCAL_SHARED_LIBRARIES := $(e2image_shared_libraries)
|
||||||
|
LOCAL_SYSTEM_SHARED_LIBRARIES := $(e2image_system_shared_libraries)
|
||||||
|
LOCAL_MODULE := e2image
|
||||||
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
LOCAL_SRC_FILES := $(e2image_src_files)
|
||||||
|
LOCAL_C_INCLUDES := $(e2image_c_includes)
|
||||||
|
LOCAL_CFLAGS := $(e2image_cflags)
|
||||||
|
LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2image_shared_libraries))
|
||||||
|
LOCAL_MODULE := e2image_host
|
||||||
|
LOCAL_MODULE_STEM := e2image
|
||||||
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
include $(BUILD_HOST_EXECUTABLE)
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#define HAVE_SYS_STAT_H 1
|
#define HAVE_SYS_STAT_H 1
|
||||||
#define HAVE_SYS_TIME_H 1
|
#define HAVE_SYS_TIME_H 1
|
||||||
#define HAVE_SYS_TYPES_H 1
|
#define HAVE_SYS_TYPES_H 1
|
||||||
|
#define HAVE_SYS_WAIT_H 1
|
||||||
#define HAVE_TERMIO_H 1
|
#define HAVE_TERMIO_H 1
|
||||||
#define HAVE_TYPE_SSIZE_T 1
|
#define HAVE_TYPE_SSIZE_T 1
|
||||||
#define HAVE_UNISTD_H 1
|
#define HAVE_UNISTD_H 1
|
||||||
|
|
Loading…
Reference in New Issue