summaryrefslogtreecommitdiffstats
path: root/prebuilt
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2015-10-09 21:46:47 +0200
committerEthan Yonker <dees_troy@teamw.in>2015-10-09 21:46:47 +0200
commit5235f5550b2e6f158ee774d6be8cefe2cc29ec99 (patch)
tree2fe6d2ae38ba2bbacccca650a4aabc1f276057a9 /prebuilt
parentMerge up to AOSP marshmallow-release (diff)
downloadandroid_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar.gz
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar.bz2
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar.lz
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar.xz
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.tar.zst
android_bootable_recovery-5235f5550b2e6f158ee774d6be8cefe2cc29ec99.zip
Diffstat (limited to 'prebuilt')
-rw-r--r--prebuilt/Android.mk10
1 files 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