diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-01 19:08:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-01 19:08:56 +0000 |
| commit | fb02f6fffc477574514ffaf0723151d0379fb505 (patch) | |
| tree | 6a7983b31d064f9315a093e5851f75dfa7b32b40 /system/OpenglSystemCommon | |
| parent | 92a62a98426b9fbfc7b70b752484a71a2d644e6a (diff) | |
| parent | 9701b0e496edb6d91eff12407fff28ce31850e38 (diff) | |
| download | device_generic_goldfish-opengl-fb02f6fffc477574514ffaf0723151d0379fb505.tar.gz device_generic_goldfish-opengl-fb02f6fffc477574514ffaf0723151d0379fb505.tar.bz2 device_generic_goldfish-opengl-fb02f6fffc477574514ffaf0723151d0379fb505.zip | |
Merge "Add libqemupipe.ranchu and libgralloc_cb.ranchu"
Diffstat (limited to 'system/OpenglSystemCommon')
| -rw-r--r-- | system/OpenglSystemCommon/ProcessPipe.cpp | 4 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/QemuPipeStream.cpp | 1 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/QemuPipeStream.h | 3 |
3 files changed, 6 insertions, 2 deletions
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..254ebd28 100644 --- a/system/OpenglSystemCommon/QemuPipeStream.cpp +++ b/system/OpenglSystemCommon/QemuPipeStream.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ #include "QemuPipeStream.h" +#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> |