diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 059879687..d54118b2c 100644 --- a/Android.mk +++ b/Android.mk @@ -100,7 +100,10 @@ LOCAL_C_INCLUDES += \ system/extras/ext4_utils \ system/core/adb \ -LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include $(LOCAL_PATH)/libmincrypt/includes +LOCAL_C_INCLUDES += bionic external/openssl/include $(LOCAL_PATH)/libmincrypt/includes +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_C_INCLUDES += external/stlport/stlport +endif LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := @@ -109,7 +112,7 @@ LOCAL_STATIC_LIBRARIES += libguitwrp LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery LOCAL_SHARED_LIBRARIES += libcrecovery -ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23)) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) LOCAL_SHARED_LIBRARIES += libstlport else LOCAL_SHARED_LIBRARIES += libc++ |