From 5046857ceb84426752d1d0b3b12336884df7a6ee Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 9 Nov 2015 11:56:17 -0600 Subject: Fix rules for libstlport Change-Id: I571e906173c9e70de97e3cfefd10da5137dba4d4 --- Android.mk | 2 +- mtp/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 47c4aa1d0..5ee7bf966 100644 --- a/Android.mk +++ b/Android.mk @@ -109,7 +109,7 @@ LOCAL_STATIC_LIBRARIES += libguitwrp LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery LOCAL_SHARED_LIBRARIES += libcrecovery -ifneq ($(wildcard external/stlport/Android.mk),) +ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23)) LOCAL_SHARED_LIBRARIES += libstlport else LOCAL_SHARED_LIBRARIES += libc++ diff --git a/mtp/Android.mk b/mtp/Android.mk index 204042557..38d31aea4 100755 --- a/mtp/Android.mk +++ b/mtp/Android.mk @@ -31,7 +31,7 @@ LOCAL_SRC_FILES = \ node.cpp LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery -ifneq ($(wildcard external/stlport/Android.mk),) +ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23)) LOCAL_SHARED_LIBRARIES += libstlport else LOCAL_SHARED_LIBRARIES += libc++ -- cgit v1.2.3