Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adf71bf7 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" 

* commit '5db3f978':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
parents 98e2c509 5db3f978

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -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