commit 3855dfbf428269d3c79dd7ba4b257ec5e9b917ff
author Yahan Zhou <yahan@google.com> Mon Oct 17 15:06:09 2016 -0700
committer Yahan Zhou <yahan@google.com> Tue Oct 18 18:58:13 2016 +0000
tree fb956ec409e1aa16f2427500d1f0f895bc395d46
parent b135d6eeb01debbd7c4cac02972af7c91228e90c

Fix the position of qemu_pipe header

In the master branch, qemu_pipe.h is in system folder. But in nyc-mr1,
it is in hardware folder.

BUG:32183368
Change-Id: Ic858d4f93280499896f9ff592459c2f4610a27df

system/OpenglSystemCommon/ProcessPipe.cpp

diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp
index e638236..b13487b 100644
--- a/system/OpenglSystemCommon/ProcessPipe.cpp
+++ b/system/OpenglSystemCommon/ProcessPipe.cpp
@@ -18,11 +18,7 @@
 
 #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;

system/OpenglSystemCommon/QemuPipeStream.cpp

diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp
index de9f3af..3804097 100644
--- a/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -14,11 +14,7 @@
 * 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>
@@ -55,11 +51,7 @@
 
 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;
 }