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
---
 adbbu/Android.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'adbbu/Android.mk')

diff --git a/adbbu/Android.mk b/adbbu/Android.mk
index 2c2d50a7b..10faf6f65 100644
--- a/adbbu/Android.mk
+++ b/adbbu/Android.mk
@@ -29,6 +29,9 @@ LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing
 LOCAL_C_INCLUDES += bionic external/zlib
 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 = \
@@ -36,10 +39,4 @@ LOCAL_SRC_FILES = \
 
 LOCAL_SHARED_LIBRARIES += libz libc libstdc++
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
-    LOCAL_SHARED_LIBRARIES += libstlport
-else
-    LOCAL_SHARED_LIBRARIES += libc++
-endif
-
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3