Revert "Fix the position of qemu_pipe header"
This change should not have made it into master.
This reverts commit 3855dfbf428269d3c79dd7ba4b257ec5e9b917ff.
Test: Built full-eng, mmma -j30 device/generic/goldfish-opengl.
Change-Id: I4bffeae147464a7a158e0daa95155d87d0a9677b
diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp
index b13487b..e638236 100644
--- a/system/OpenglSystemCommon/ProcessPipe.cpp
+++ b/system/OpenglSystemCommon/ProcessPipe.cpp
@@ -18,7 +18,11 @@
#include <cutils/log.h>
#include <pthread.h>
+#if PLATFORM_SDK_VERSION > 24
+#include <system/qemu_pipe.h>
+#else // PLATFORM_SDK_VERSION
#include <hardware/qemu_pipe.h>
+#endif //PLATFORM_SDK_VERSION
static int sProcPipe = 0;
static pthread_once_t sProcPipeOnce = PTHREAD_ONCE_INIT;
diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp
index 3804097..de9f3af 100644
--- a/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -14,7 +14,11 @@
* limitations under the License.
*/
#include "QemuPipeStream.h"
+#if PLATFORM_SDK_VERSION > 24
+#include <system/qemu_pipe.h>
+#else // PLATFORM_SDK_VERSION
#include <hardware/qemu_pipe.h>
+#endif //PLATFORM_SDK_VERSION
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@ -51,7 +55,11 @@
int QemuPipeStream::connect(void)
{
+#if PLATFORM_SDK_VERSION > 24
+ m_sock = qemu_pipe_open("pipe:opengles");
+#else // PLATFORM_SDK_VERSION
m_sock = qemu_pipe_open("opengles");
+#endif // PLATFORM_SDK_VERSION
if (!valid()) return -1;
return 0;
}