diff options
| author | Xing <xing@Xings-iMac.local> | 2015-11-27 20:19:37 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2015-12-23 21:36:41 +0100 |
| commit | 0af1ac13d16ede841ef6f16c859c24f8f1e3d16f (patch) | |
| tree | 0dff623b6466f5f2aed2c2bc02bcb12f1448a461 /Android.mk | |
| parent | init: Add new props triggers (diff) | |
| download | android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar.gz android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar.bz2 android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar.lz android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar.xz android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.tar.zst android_bootable_recovery-0af1ac13d16ede841ef6f16c859c24f8f1e3d16f.zip | |
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++ |