diff options
Diffstat (limited to '')
| -rwxr-xr-x | mtp/Android.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mtp/Android.mk b/mtp/Android.mk index 283a283dd..204042557 100755 --- a/mtp/Android.mk +++ b/mtp/Android.mk @@ -29,7 +29,13 @@ LOCAL_SRC_FILES = \ twrpMtp.cpp \ mtp_MtpDatabase.cpp \ node.cpp -LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libstlport libdl libcutils libutils libaosprecovery +LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery + +ifneq ($(wildcard external/stlport/Android.mk),) + LOCAL_SHARED_LIBRARIES += libstlport +else + LOCAL_SHARED_LIBRARIES += libc++ +endif ifneq ($(TW_MTP_DEVICE),) LOCAL_CFLAGS += -DUSB_MTP_DEVICE=$(TW_MTP_DEVICE) @@ -44,7 +50,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := twrpmtp LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -DTWRPMTP -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/ LOCAL_SRC_FILES = \ btree.cpp \ MtpDataPacket.cpp \ @@ -66,5 +72,5 @@ LOCAL_SRC_FILES = \ twrpMtp.cpp \ mtp_MtpDatabase.cpp \ node.cpp -LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libstlport libdl libcutils libutils libaosprecovery +LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery include $(BUILD_EXECUTABLE) |