commit 414240822564b1024c17b5aaba42c3161aba0259
author mar-v-in <github@rvin.mooo.com> Tue Mar 10 19:06:16 2015 +0100
committer Ethan Yonker <dees_troy@teamw.in> Wed Mar 11 09:50:45 2015 -0500
tree 6201cd8e0afdad1e8ca97858fdf9fa65c79e2c29
parent 92084af6e8dd185a386cc07b84089b246a2703c7

Handle sdk version 22 as lollipop

Change-Id: I87c17715d7acdf6ae15f8a39e3e316715bade6f3

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 00c5248..9ff304c 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -69,7 +69,7 @@
 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 @@
     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