commit 534d4e0612d96210fe76c03c8c0a0355e0f20453
author Ethan Yonker <dees_troy@teamw.in> Fri Aug 26 10:05:03 2016 -0500
committer Ethan Yonker <dees_troy@teamw.in> Fri Aug 26 10:05:03 2016 -0500
tree 05324fc8c6c0d97d76fbc607d72ced81f5a0bb9d
parent df681841e30ada98db99ad472f64ac9af1f25be2

Fix compatibility across the board

Change-Id: I6376920775ddabb4d4af505fffd86e404403a64a

adbbu/Android.mk

diff --git a/adbbu/Android.mk b/adbbu/Android.mk
index 2c2d50a..10faf6f 100644
--- a/adbbu/Android.mk
+++ b/adbbu/Android.mk
@@ -29,6 +29,9 @@
 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_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)