diff options
| author | Matt Mower <mowerm@gmail.com> | 2015-12-10 18:54:28 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-12-22 18:25:34 +0100 |
| commit | 582949125c04eb79f83aaf3cf9dd620eeb54c807 (patch) | |
| tree | 7c01e2708433a7d200c09e298968e5312fcad460 | |
| parent | Improve string resource lookup in twmsg (diff) | |
| download | android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar.gz android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar.bz2 android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar.lz android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar.xz android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.tar.zst android_bootable_recovery-582949125c04eb79f83aaf3cf9dd620eeb54c807.zip | |
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 13 |
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 |