From a1f38054c7eb48b03a55d1559190637238d88fe1 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 11 Sep 2014 08:28:51 -0500 Subject: MTP: Build flag for setting custom MTP device/path Change-Id: Ic19ec61dc6cb08df00eb1326d96262b46bb93bfb --- mtp/Android.mk | 5 +++++ mtp/mtp_MtpServer.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'mtp') diff --git a/mtp/Android.mk b/mtp/Android.mk index ebf1a6d36..683999d31 100755 --- a/mtp/Android.mk +++ b/mtp/Android.mk @@ -30,6 +30,11 @@ LOCAL_SRC_FILES = \ mtp_MtpDatabase.cpp \ node.cpp LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libstlport libdl libcutils libutils + +ifneq ($(TW_MTP_DEVICE),) + LOCAL_CFLAGS += -DUSB_MTP_DEVICE=$(TW_MTP_DEVICE) +endif + include $(BUILD_SHARED_LIBRARY) # Build twrpmtp binary / executable diff --git a/mtp/mtp_MtpServer.cpp b/mtp/mtp_MtpServer.cpp index af80f6826..9df564ffc 100755 --- a/mtp/mtp_MtpServer.cpp +++ b/mtp/mtp_MtpServer.cpp @@ -47,11 +47,13 @@ void twmtp_MtpServer::set_storages(storages* mtpstorages) { int twmtp_MtpServer::setup() { - #define USB_MTP_DEVICE "/dev/mtp_usb" usePtp = false; MyMtpDatabase* mtpdb = new MyMtpDatabase(); #ifdef USB_MTP_DEVICE - int fd = open(USB_MTP_DEVICE, O_RDWR); +#define STRINGIFY(x) #x +#define EXPAND(x) STRINGIFY(x) + MTPI("Using '%s' for MTP device.\n", EXPAND(USB_MTP_DEVICE)); + int fd = open(EXPAND(USB_MTP_DEVICE), O_RDWR); #else int fd = open("/dev/mtp_usb", O_RDWR); #endif -- cgit v1.2.3