From 5235f5550b2e6f158ee774d6be8cefe2cc29ec99 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Fri, 9 Oct 2015 14:46:47 -0500 Subject: Fix mkfs.f2fs error in 6.0 trees Change-Id: I1217094f0e336445eb4dd5f46242d9719525ffbd --- prebuilt/Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 25c31478e..7b7551166 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -163,10 +163,14 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libopenaes.so endif ifeq ($(TARGET_USERIMAGES_USE_F2FS), true) - ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22)) - RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/mkfs.f2fs + ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23)) + RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkfs.f2fs else - RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.f2fs + ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22)) + RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/mkfs.f2fs + else + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.f2fs + endif endif RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.f2fs endif -- cgit v1.2.3