diff options
| author | David Reveman <reveman@google.com> | 2020-07-01 09:53:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 09:53:35 +0000 |
| commit | fbdcc6e7170a005d443f8a85218a21a5103b0552 (patch) | |
| tree | 8d0051243c4bd46e0af486ef886dcf6c784c63cf | |
| parent | a7bd7128e020b93620f4237c79afb4f095badb11 (diff) | |
| parent | 85ada1a489362a972ac974d4809315ce176ece48 (diff) | |
| download | device_generic_goldfish-opengl-fbdcc6e7170a005d443f8a85218a21a5103b0552.tar.gz device_generic_goldfish-opengl-fbdcc6e7170a005d443f8a85218a21a5103b0552.tar.bz2 device_generic_goldfish-opengl-fbdcc6e7170a005d443f8a85218a21a5103b0552.zip | |
Fix Fuchsia build. am: 744cad1c13 am: 85ada1a489
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1352904
Change-Id: I715473ca1701da280624144faec169548b47895f
3 files changed, 7 insertions, 3 deletions
diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl index e16bd800..9c4f3faf 100644 --- a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl +++ b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl @@ -437,7 +437,7 @@ void goldfish_address_space_unmap(void* ptr, uint64_t size) { bool goldfish_address_space_ping( address_space_handle_t handle, - struct goldfish_address_space_ping* ping) { + struct address_space_ping* ping) { AddressSpaceChildDriverPingMessage fuchsiaPing = *(AddressSpaceChildDriverPingMessage*)ping; @@ -454,6 +454,6 @@ bool goldfish_address_space_ping( return false; } - *ping = *(struct goldfish_address_space_ping*)(&res); + *ping = *(struct address_space_ping*)(&res); return true; } diff --git a/system/OpenglSystemCommon/AddressSpaceStream.cpp b/system/OpenglSystemCommon/AddressSpaceStream.cpp index df34adc6..4f26da97 100644 --- a/system/OpenglSystemCommon/AddressSpaceStream.cpp +++ b/system/OpenglSystemCommon/AddressSpaceStream.cpp @@ -155,7 +155,7 @@ AddressSpaceStream* createVirtioGpuAddressSpaceStream(size_t ignored_bufSize) { auto handle = virtgpu_address_space_open(); - if (handle <= 0) { + if (handle == reinterpret_cast<address_space_handle_t>(-1)) { ALOGE("AddressSpaceStream::create failed (open device)\n"); return nullptr; } diff --git a/system/OpenglSystemCommon/AddressSpaceStream.h b/system/OpenglSystemCommon/AddressSpaceStream.h index 3d60695e..4b38d613 100644 --- a/system/OpenglSystemCommon/AddressSpaceStream.h +++ b/system/OpenglSystemCommon/AddressSpaceStream.h @@ -47,8 +47,12 @@ public: virtual const unsigned char *commitBufferAndReadFully(size_t size, void *buf, size_t len); int getRendernodeFd() const { +#if defined(__Fuchsia__) + return -1; +#else if (!m_virtioMode) return -1; return m_handle; +#endif } private: |