From 05a53a389852a9e52b816c087465f4e0c5009613 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 29 Jun 2010 16:42:13 -0400
Subject: MTP: Add MtpServer Java class to wrap MTP device support.

Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 media/mtp/Android.mk | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to 'media/mtp/Android.mk')

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)
 
-- 
cgit v1.1