Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"

This commit is contained in:
Elliott Hughes 2015-02-11 01:37:49 +00:00 committed by Gerrit Code Review
commit 5db3f97877

View file

@ -54,6 +54,8 @@ RECOVERY_FSTAB_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_C_INCLUDES += system/vold
LOCAL_STATIC_LIBRARIES := \
libext4_utils_static \
libsparse_static \
@ -76,7 +78,7 @@ LOCAL_STATIC_LIBRARIES := \
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_CFLAGS += -DUSE_EXT4
LOCAL_C_INCLUDES += system/extras/ext4_utils system/vold
LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
endif