openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fastboot: fix windows sdk build (don't do f2fs dyn load on windows) 

Only do f2fs dynamic loading on linux.
Adds a stub for windows builds.

Change-Id: I7bbaaa1b2ff5992709d904b7ace40ae263d32922
Signed-off-by: JP Abgrall <jpa@google.com>
This commit is contained in:
JP Abgrall 2014-06-17 23:43:18 -07:00
parent e14efeac9a
commit 6bd72beff6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fastboot/Android.mk
View File

@ -51,24 +51,28 @@ ifeq ($(HOST_OS),windows)
LOCAL_C_INCLUDES += development/host/windows/usb/api
endif
# The following libf2fs_* are from system/extras/f2fs_utils,
# and do not use code in external/f2fs-tools.
LOCAL_STATIC_LIBRARIES := \
$(EXTRA_STATIC_LIBS) \
libzipfile \
libunz \
libext4_utils_host \
libf2fs_utils_host \
libf2fs_dlutils_host \
libsparse_host \
libz
# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")
LOCAL_LDLIBS := -ldl
LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn
ifneq ($(HOST_OS),windows)
LOCAL_STATIC_LIBRARIES += libselinux
endif # HOST_OS != windows
ifneq ($(HOST_OS),windows)
# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")
LOCAL_CFLAGS += -DUSE_F2FS
LOCAL_LDLIBS += -ldl
LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn
# The following libf2fs_* are from system/extras/f2fs_utils,
# and do not use code in external/f2fs-tools.
LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_dlutils_host
endif
include $(BUILD_HOST_EXECUTABLE)

9
fastboot/fs.c
View File

@ -29,11 +29,12 @@ static int generate_ext4_image(int fd, long long partSize)
return 0;
}
int generate_f2fs_image(int fd, long long partSize)
#ifdef USE_F2FS
static int generate_f2fs_image(int fd, long long partSize)
{
make_f2fs_sparse_fd(fd, partSize, NULL, NULL);
return 0;
return make_f2fs_sparse_fd(fd, partSize, NULL, NULL);
}
#endif
static const struct fs_generator {
@ -42,7 +43,9 @@ static const struct fs_generator {
} generators[] = {
{ "ext4", generate_ext4_image},
#ifdef USE_F2FS
{ "f2fs", generate_f2fs_image},
#endif
};
const struct fs_generator* fs_get_generator(const char *fs_type)