MTP: Add MtpServer Java class to wrap MTP device support.
Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk
index 9f684e1..f363b7c 100644
--- a/media/mtp/Android.mk
+++ b/media/mtp/Android.mk
@@ -20,62 +20,55 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- mtptest.cpp \
+ MtpClient.cpp \
+ MtpCursor.cpp \
MtpDatabase.cpp \
MtpDataPacket.cpp \
MtpDebug.cpp \
+ MtpDevice.cpp \
+ MtpDeviceInfo.cpp \
MtpMediaScanner.cpp \
+ MtpObjectInfo.cpp \
MtpPacket.cpp \
+ MtpProperty.cpp \
MtpRequestPacket.cpp \
MtpResponsePacket.cpp \
MtpServer.cpp \
+ MtpStorageInfo.cpp \
MtpStringBuffer.cpp \
MtpStorage.cpp \
MtpUtils.cpp \
SqliteDatabase.cpp \
SqliteStatement.cpp \
-LOCAL_MODULE:= mtptest
+LOCAL_MODULE:= libmtp
LOCAL_C_INCLUDES := external/sqlite/dist
+LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= \
+ mtptest.cpp \
+
+LOCAL_MODULE:= mtptest
+
LOCAL_CFLAGS := -DMTP_DEVICE
LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libcutils \
libmedia
+LOCAL_STATIC_LIBRARIES := libmtp
+
include $(BUILD_EXECUTABLE)
endif
include $(CLEAR_VARS)
-LOCAL_MODULE := libmtphost
-
-LOCAL_SRC_FILES:= \
- MtpClient.cpp \
- MtpCursor.cpp \
- MtpDataPacket.cpp \
- MtpDebug.cpp \
- MtpDevice.cpp \
- MtpDeviceInfo.cpp \
- MtpObjectInfo.cpp \
- MtpPacket.cpp \
- MtpProperty.cpp \
- MtpRequestPacket.cpp \
- MtpResponsePacket.cpp \
- MtpStorageInfo.cpp \
- MtpStringBuffer.cpp \
- MtpUtils.cpp \
-
-
-LOCAL_CFLAGS := -g -DMTP_HOST
-LOCAL_LDFLAGS := -g
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
LOCAL_MODULE := scantest
LOCAL_SRC_FILES:= \
scantest.cpp \