Revert "Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe"
It broke master
BUG: 36695011
This reverts commit ff87855e10423a1ad6f764f378b8182f86c6f738.
Change-Id: Ic1057a416748d4a3c9736cf3bb73982b8d45e5d5
diff --git a/adb/Android.mk b/adb/Android.mk
index a05bb55..e841205 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -128,7 +128,7 @@
# Even though we're building a static library (and thus there's no link step for
# this to take effect), this adds the includes to our path.
-LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libqemu_pipe libbase
+LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase
LOCAL_WHOLE_STATIC_LIBRARIES := libadbd_usb
@@ -361,7 +361,6 @@
LOCAL_STATIC_LIBRARIES := \
libadbd \
libbase \
- libqemu_pipe \
libbootloader_message \
libfs_mgr \
libfec \
diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp
index 12b98ba..4198a52 100644
--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -289,7 +289,7 @@
#define open adb_open
#define read adb_read
#define write adb_write
-#include <qemu_pipe.h>
+#include <system/qemu_pipe.h>
#undef open
#undef read
#undef write