diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-10-09 18:15:26 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-10-09 18:15:29 +0200 |
| commit | c798c9cd2486e0ff83776002c74f113677b10a84 (patch) | |
| tree | d128a80cbc58e63a622fda2774e727611f9d2cd4 /mtp | |
| parent | Add TW_IGNORE_ABS_MT_TRACKING_ID (diff) | |
| parent | merge in mnc-release history after reset to mnc-dev (diff) | |
| download | android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.gz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.bz2 android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.lz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.xz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.zst android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.zip | |
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) |