diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk
index 40adf180494d5..cb1c0d3b57a9c 100644
--- a/media/mtp/Android.mk
+++ b/media/mtp/Android.mk
@@ -46,3 +46,33 @@ LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST
 include $(BUILD_STATIC_LIBRARY)
 
 endif
+
+ifeq ($(HOST_OS),linux)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=                                       \
+                  MtpClient.cpp                         \
+                  MtpCursor.cpp                         \
+                  MtpDataPacket.cpp                     \
+                  MtpDebug.cpp                          \
+                  MtpDevice.cpp                         \
+                  MtpEventPacket.cpp                    \
+                  MtpDeviceInfo.cpp                     \
+                  MtpObjectInfo.cpp                     \
+                  MtpPacket.cpp                         \
+                  MtpProperty.cpp                       \
+                  MtpRequestPacket.cpp                  \
+                  MtpResponsePacket.cpp                 \
+                  MtpStorageInfo.cpp                    \
+                  MtpStringBuffer.cpp                   \
+                  MtpStorage.cpp                        \
+                  MtpUtils.cpp                          \
+
+LOCAL_MODULE:= libmtp
+
+LOCAL_CFLAGS := -DMTP_HOST
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/media/mtp/MtpEventPacket.cpp b/media/mtp/MtpEventPacket.cpp
index 089278e585874..fc74542106c0c 100644
--- a/media/mtp/MtpEventPacket.cpp
+++ b/media/mtp/MtpEventPacket.cpp
@@ -21,7 +21,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
+#ifdef MTP_DEVICE
 #include <linux/usb/f_mtp.h>
+#endif
 
 #include "MtpEventPacket.h"