diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-29 16:42:13 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-06-30 17:02:07 -0400 |
| commit | 05a53a389852a9e52b816c087465f4e0c5009613 (patch) | |
| tree | 480610cfd1c519a89ecc83557aadbe9d001a0118 /media/mtp | |
| parent | b14e588bec4d5e39e61b020b5b575f2ce555d316 (diff) | |
| download | frameworks_av-05a53a389852a9e52b816c087465f4e0c5009613.zip frameworks_av-05a53a389852a9e52b816c087465f4e0c5009613.tar.gz frameworks_av-05a53a389852a9e52b816c087465f4e0c5009613.tar.bz2 | |
MTP: Add MtpServer Java class to wrap MTP device support.
Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp')
| -rw-r--r-- | media/mtp/Android.mk | 47 | ||||
| -rw-r--r-- | media/mtp/MtpTypes.h | 2 |
2 files changed, 21 insertions, 28 deletions
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,59 +20,52 @@ ifneq ($(TARGET_SIMULATOR),true) 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 +LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST -LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libcutils \ - libmedia +include $(BUILD_STATIC_LIBRARY) -include $(BUILD_EXECUTABLE) +include $(CLEAR_VARS) -endif +LOCAL_SRC_FILES:= \ + mtptest.cpp \ -include $(CLEAR_VARS) +LOCAL_MODULE:= mtptest -LOCAL_MODULE := libmtphost +LOCAL_CFLAGS := -DMTP_DEVICE -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_SHARED_LIBRARIES := libutils libsqlite libstagefright libcutils \ + libmedia +LOCAL_STATIC_LIBRARIES := libmtp -LOCAL_CFLAGS := -g -DMTP_HOST -LOCAL_LDFLAGS := -g +include $(BUILD_EXECUTABLE) -include $(BUILD_STATIC_LIBRARY) +endif include $(CLEAR_VARS) diff --git a/media/mtp/MtpTypes.h b/media/mtp/MtpTypes.h index 6a33a2b..b7c79b2 100644 --- a/media/mtp/MtpTypes.h +++ b/media/mtp/MtpTypes.h @@ -42,7 +42,7 @@ typedef MtpPropertyCode MtpObjectProperty; // values 0x00000000 and 0xFFFFFFFF are reserved for special purposes. typedef uint32_t MtpObjectHandle; -typedef union MtpPropertyValue { +union MtpPropertyValue { int8_t i8; uint8_t u8; int16_t i16; |