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 | |
| 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 | |
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | gui/Android.mk | 6 | ||||
| -rwxr-xr-x | mtp/Android.mk | 8 | ||||
| -rw-r--r-- | twrpTarMain/Android.mk | 11 |
4 files changed, 25 insertions, 7 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++ diff --git a/gui/Android.mk b/gui/Android.mk index 84f890ca7..40e0cd936 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -70,7 +70,11 @@ ifeq ($(TW_ROUND_SCREEN), true) LOCAL_CFLAGS += -DTW_ROUND_SCREEN endif -LOCAL_C_INCLUDES += bionic external/stlport/stlport system/core/libpixelflinger/include +LOCAL_C_INCLUDES += bionic system/core/libpixelflinger/include +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_C_INCLUDES += external/stlport/stlport +endif + LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\" include $(BUILD_STATIC_LIBRARY) diff --git a/mtp/Android.mk b/mtp/Android.mk index 38d31aea4..57f0ae35e 100755 --- a/mtp/Android.mk +++ b/mtp/Android.mk @@ -7,7 +7,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := libtwrpmtp LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing -LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic external/stlport/stlport frameworks/base/include system/core/include bionic/libc/private/ +LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/ +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_C_INCLUDES += external/stlport/stlport +endif + LOCAL_SRC_FILES = \ btree.cpp \ MtpDataPacket.cpp \ @@ -31,7 +35,7 @@ LOCAL_SRC_FILES = \ node.cpp LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery -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++ diff --git a/twrpTarMain/Android.mk b/twrpTarMain/Android.mk index 5f15bf037..5a1a4434f 100644 --- a/twrpTarMain/Android.mk +++ b/twrpTarMain/Android.mk @@ -11,8 +11,15 @@ LOCAL_SRC_FILES:= \ ../twrpDU.cpp LOCAL_CFLAGS:= -g -c -W -DBUILD_TWRPTAR_MAIN -LOCAL_C_INCLUDES += bionic external/stlport/stlport -LOCAL_STATIC_LIBRARIES := libc libtar_static libstlport_static libstdc++ +LOCAL_C_INCLUDES += bionic +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_C_INCLUDES += external/stlport/stlport +endif + +LOCAL_STATIC_LIBRARIES := libc libtar_static libstdc++ +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_STATIC_LIBRARIES += libstlport_static +endif ifeq ($(TWHAVE_SELINUX), true) LOCAL_C_INCLUDES += external/libselinux/include |