From 534d4e0612d96210fe76c03c8c0a0355e0f20453 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Fri, 26 Aug 2016 10:05:03 -0500
Subject: Fix compatibility across the board

Change-Id: I6376920775ddabb4d4af505fffd86e404403a64a
---
 mtp/Android.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mtp')

diff --git a/mtp/Android.mk b/mtp/Android.mk
index 7128bdefe..c6a7fb7db 100644
--- a/mtp/Android.mk
+++ b/mtp/Android.mk
@@ -9,6 +9,9 @@ LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasi
 LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
     LOCAL_C_INCLUDES += external/stlport/stlport
+    LOCAL_SHARED_LIBRARIES += libstlport
+else
+    LOCAL_SHARED_LIBRARIES += libc++
 endif
 
 LOCAL_SRC_FILES = \
@@ -34,12 +37,6 @@ LOCAL_SRC_FILES = \
     node.cpp
 LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery libselinux
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
-    LOCAL_SHARED_LIBRARIES += libstlport
-else
-    LOCAL_SHARED_LIBRARIES += libc++
-endif
-
 ifneq ($(TW_MTP_DEVICE),)
 	LOCAL_CFLAGS += -DUSB_MTP_DEVICE=$(TW_MTP_DEVICE)
 endif
-- 
cgit v1.2.3