summaryrefslogtreecommitdiffstats
path: root/prebuilt/Android.mk
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-11-21 20:54:27 +0100
committerEthan Yonker <dees_troy@teamw.in>2014-12-02 17:34:15 +0100
commit75bf041a8ad75f8fc9bba69e937e12b129338a4c (patch)
tree9a3202b8c06e075e1749a44948a3a3f184edf95e /prebuilt/Android.mk
parentTWRP MTP: make sure inotify_fd is set (diff)
downloadandroid_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar.gz
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar.bz2
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar.lz
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar.xz
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.tar.zst
android_bootable_recovery-75bf041a8ad75f8fc9bba69e937e12b129338a4c.zip
Diffstat (limited to '')
-rw-r--r--prebuilt/Android.mk25
1 files changed, 16 insertions, 9 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 7d860b00e..bb1a7c1d6 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -33,8 +33,6 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker
#RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/twrpmtp
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libc.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcutils.so
-# Not available in 5.0
-#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcorkscrew.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrecovery.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libusbhost.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgccdemangle.so
@@ -61,12 +59,16 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmmcutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbmlutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libflashutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libstlport.so
-# libraries from lollipop
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfusesideload.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind-ptrace.so
-# end libraries from lollipop
+ifeq ($(PLATFORM_VERSION), 5.0)
+ # libraries from lollipop
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind.so
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind-ptrace.so
+else
+ # Not available in lollipop
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcorkscrew.so
+endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypttwrp.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/toolbox
ifneq ($(TW_OEM_BUILD),true)
@@ -143,9 +145,14 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libopenaes.so
endif
ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
- RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/mkfs.f2fs
+ ifeq ($(PLATFORM_VERSION), 5.0)
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/mkfs.f2fs
+ #RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT_SBIN)/fibmap.f2fs
+ else
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.f2fs
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fibmap.f2fs
+ endif
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.f2fs
- #RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fibmap.f2fs
endif
ifneq ($(wildcard system/core/reboot/Android.mk),)
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/reboot