diff options
| author | Roman Kiryanov <rkir@google.com> | 2020-04-28 13:22:29 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2020-05-04 12:48:53 -0700 |
| commit | 04cdd7be1eabbf1df88be049d9d2148ec5c07acf (patch) | |
| tree | 1561e635de8f81b7137cd5ddc77b7894312ddb4a /system/OpenglSystemCommon | |
| parent | 0dba078a75ac287fc59665421b625bf236389a6e (diff) | |
| download | device_generic_goldfish-opengl-04cdd7be1eabbf1df88be049d9d2148ec5c07acf.tar.gz device_generic_goldfish-opengl-04cdd7be1eabbf1df88be049d9d2148ec5c07acf.tar.bz2 device_generic_goldfish-opengl-04cdd7be1eabbf1df88be049d9d2148ec5c07acf.zip | |
(reland) Add libqemupipe.ranchu and libgralloc_cb.ranchu
Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I5afbad19d2feafd6a6fa3d6cef38aeb13be4fb67
Diffstat (limited to 'system/OpenglSystemCommon')
| -rw-r--r-- | system/OpenglSystemCommon/HostConnection.cpp | 2 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/ProcessPipe.cpp | 4 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/QemuPipeStream.cpp | 2 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/QemuPipeStream.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp index fbb946f8..c5075fc2 100644 --- a/system/OpenglSystemCommon/HostConnection.cpp +++ b/system/OpenglSystemCommon/HostConnection.cpp @@ -66,7 +66,7 @@ using goldfish_vk::VkEncoder; #include "QemuPipeStream.h" #include "TcpStream.h" #include "ThreadInfo.h" - +#define ALLOW_DEPRECATED_QEMU_PIPE_HEADERS #include "gralloc_cb.h" #ifdef VIRTIO_GPU diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp index 40cb2980..56f1e528 100644 --- a/system/OpenglSystemCommon/ProcessPipe.cpp +++ b/system/OpenglSystemCommon/ProcessPipe.cpp @@ -16,7 +16,9 @@ #include "ProcessPipe.h" #include "renderControl_enc.h" -#include "qemu_pipe.h" + +#define ALLOW_DEPRECATED_QEMU_PIPE_HEADERS +#include <qemu_pipe.h> #if PLATFORM_SDK_VERSION < 26 #include <cutils/log.h> diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp index e71821f0..55f5fe85 100644 --- a/system/OpenglSystemCommon/QemuPipeStream.cpp +++ b/system/OpenglSystemCommon/QemuPipeStream.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ #include "QemuPipeStream.h" +#define ALLOW_DEPRECATED_QEMU_PIPE_HEADERS +#include <qemu_pipe.h> #if PLATFORM_SDK_VERSION < 26 #include <cutils/log.h> diff --git a/system/OpenglSystemCommon/QemuPipeStream.h b/system/OpenglSystemCommon/QemuPipeStream.h index 87638afd..9ca44597 100644 --- a/system/OpenglSystemCommon/QemuPipeStream.h +++ b/system/OpenglSystemCommon/QemuPipeStream.h @@ -23,7 +23,8 @@ #include <stdlib.h> #include "IOStream.h" -#include "qemu_pipe.h" +#define ALLOW_DEPRECATED_QEMU_PIPE_HEADERS +#include <qemu_pipe.h> #ifdef __Fuchsia__ #include <fuchsia/hardware/goldfish/cpp/fidl.h> |