Fix Fuchsia build.
Change-Id: Ifad3cb5a3d18568b408b98f704fe653a7d0e5b1b
diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
index e16bd80..9c4f3fa 100644
--- a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
+++ b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
@@ -437,7 +437,7 @@
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 @@
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 df34adc..4f26da9 100644
--- a/system/OpenglSystemCommon/AddressSpaceStream.cpp
+++ b/system/OpenglSystemCommon/AddressSpaceStream.cpp
@@ -155,7 +155,7 @@
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 3d60695..4b38d61 100644
--- a/system/OpenglSystemCommon/AddressSpaceStream.h
+++ b/system/OpenglSystemCommon/AddressSpaceStream.h
@@ -47,8 +47,12 @@
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:
