summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2015-03-10 19:06:16 +0100
committerEthan Yonker <dees_troy@teamw.in>2015-03-11 15:50:45 +0100
commit414240822564b1024c17b5aaba42c3161aba0259 (patch)
tree6201cd8e0afdad1e8ca97858fdf9fa65c79e2c29
parenttoolbox: Cleanup Makefile (diff)
downloadandroid_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar.gz
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar.bz2
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar.lz
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar.xz
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.tar.zst
android_bootable_recovery-414240822564b1024c17b5aaba42c3161aba0259.zip
Diffstat (limited to '')
-rw-r--r--prebuilt/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 00c524890..9ff304cd8 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -69,7 +69,7 @@ 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
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfusesideload.so
-ifeq ($(PLATFORM_SDK_VERSION), 21)
+ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22))
# libraries from lollipop
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind.so
@@ -138,7 +138,7 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libopenaes.so
endif
ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
- ifeq ($(PLATFORM_SDK_VERSION), 21)
+ 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