DO NOT MERGE ANYWHERE goldfish-opengl: adjust to the refactored qemu_pipe

Qemu_pipe is refactored into a library, adjust goldfish-opengl
accordingly.

Change-Id: I6fe6a98a962ac1bcfeb0395a575115054464d72e

diff --git a/Android.mk b/Android.mk
index 95b70ad..46bf2b5 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,8 @@ EMUGL_PATH := $(call my-dir)
 # This is always set to a module's LOCAL_C_INCLUDES
 # See the definition of emugl-begin-module in common.mk
 #
-EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender $(EMUGL_PATH)/system/include
+EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender $(EMUGL_PATH)/system/include \
+                         system/core/qemu_pipe/include
 
 # common cflags used by several modules
 # This is always set to a module's LOCAL_CFLAGS

diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk
index acf9ce1..34f0fd5 100644 (file)
--- a/system/OpenglSystemCommon/Android.mk
+++ b/system/OpenglSystemCommon/Android.mk
@@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir)
 $(call emugl-begin-shared-library,libOpenglSystemCommon)
 $(call emugl-import,libGLESv1_enc libGLESv2_enc lib_renderControl_enc)
 
+
+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
 LOCAL_SRC_FILES := \
     HostConnection.cpp \
     ProcessPipe.cpp    \

diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp
index e638236..9741f6c 100644 (file)
--- a/system/OpenglSystemCommon/ProcessPipe.cpp
+++ b/system/OpenglSystemCommon/ProcessPipe.cpp
@@ -19,7 +19,7 @@
 #include <cutils/log.h>
 #include <pthread.h>
 #if PLATFORM_SDK_VERSION > 24
-#include <system/qemu_pipe.h>
+#include <qemu_pipe.h>
 #else // PLATFORM_SDK_VERSION
 #include <hardware/qemu_pipe.h>
 #endif //PLATFORM_SDK_VERSION
@@ -79,4 +79,4 @@ bool processPipeInit(renderControl_encoder_context_t *rcEnc) {
     if (!sProcPipe) return false;
     rcEnc->rcSetPuid(rcEnc, sProcUID);
     return true;
-}
\ No newline at end of file
+}

diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp
index de9f3af..f6ec11c 100644 (file)
--- a/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -15,7 +15,7 @@
 */
 #include "QemuPipeStream.h"
 #if PLATFORM_SDK_VERSION > 24
-#include <system/qemu_pipe.h>
+#include <qemu_pipe.h>
 #else // PLATFORM_SDK_VERSION
 #include <hardware/qemu_pipe.h>
 #endif //PLATFORM_SDK_VERSION