From 414240822564b1024c17b5aaba42c3161aba0259 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Tue, 10 Mar 2015 19:06:16 +0100 Subject: Handle sdk version 22 as lollipop Change-Id: I87c17715d7acdf6ae15f8a39e3e316715bade6f3 --- prebuilt/Android.mk | 4 ++-- 1 file 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 -- cgit v1.2.3