MTP: Make MtpDatabase class abstract so we can have multiple implementations
Rename existing test database to MtpSqliteDatabase
This is the first step in transitioning to using the media provider database
Change-Id: I5f36c854c6e76a79137c267b000a52ced803776c
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk
index 3c9909b..13a6430 100644
--- a/media/mtp/Android.mk
+++ b/media/mtp/Android.mk
@@ -32,6 +32,7 @@
MtpRequestPacket.cpp \
MtpResponsePacket.cpp \
MtpServer.cpp \
+ MtpSqliteDatabase.cpp \
MtpStorageInfo.cpp \
MtpStringBuffer.cpp \
MtpStorage.cpp \
@@ -70,18 +71,9 @@
LOCAL_MODULE := scantest
LOCAL_SRC_FILES:= \
scantest.cpp \
- MtpMediaScanner.cpp \
- MtpDatabase.cpp \
- MtpDataPacket.cpp \
- MtpPacket.cpp \
- MtpStringBuffer.cpp \
- MtpUtils.cpp \
- SqliteDatabase.cpp \
- SqliteStatement.cpp \
-#LOCAL_STATIC_LIBRARIES := libusbhost
-#LOCAL_LDLIBS := -lpthread
+LOCAL_STATIC_LIBRARIES := libmtp
LOCAL_C_INCLUDES := external/sqlite/dist
LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libmedia