Fix compatibility across the board
Change-Id: I6376920775ddabb4d4af505fffd86e404403a64a
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)