summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk7
-rw-r--r--prebuilt/Android.mk13
2 files changed, 14 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 61435c314..6d9959c2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -415,6 +415,13 @@ ifeq ($(TW_INCLUDE_NTFS_3G),true)
ntfsfix \
mkntfs
endif
+ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
+ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 3; echo $$?),0)
+ LOCAL_ADDITIONAL_DEPENDENCIES += \
+ fsck.f2fs \
+ mkfs.f2fs
+endif
+endif
include $(BUILD_EXECUTABLE)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 036d60267..216057372 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -163,14 +163,15 @@ 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), 23))
+ ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 4; echo $$?),0)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.f2fs
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libf2fs.so
+ else ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23))
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkfs.f2fs
+ else ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22))
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/mkfs.f2fs
else
- 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
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.f2fs
endif
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.f2fs
endif