goldfish-opengl: always use local virtgpu_drm.h
This seems to work without even modiying an Android.mk file,
since eveything includes system/include already.
BUG=202552093
TEST=compile
Change-Id: I581e99edbe0ab2d8702170abcd39d2034ad7e254
diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index 578c8ef..ac7ef15 100644
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -83,9 +83,9 @@
#include "VirtioGpuStream.h"
#include "VirtioGpuPipeStream.h"
+#include "virtgpu_drm.h"
#include <cros_gralloc_handle.h>
-#include <virtgpu_drm.h>
#include <xf86drm.h>
#endif
diff --git a/system/OpenglSystemCommon/VirtioGpuPipeStream.cpp b/system/OpenglSystemCommon/VirtioGpuPipeStream.cpp
index 82f5048..1cb242e 100644
--- a/system/OpenglSystemCommon/VirtioGpuPipeStream.cpp
+++ b/system/OpenglSystemCommon/VirtioGpuPipeStream.cpp
@@ -15,8 +15,8 @@
*/
#include "VirtioGpuPipeStream.h"
+#include "virtgpu_drm.h"
-#include <virtgpu_drm.h>
#include <xf86drm.h>
#include <sys/types.h>
diff --git a/system/OpenglSystemCommon/VirtioGpuStream.cpp b/system/OpenglSystemCommon/VirtioGpuStream.cpp
index 4eea921..21a76e9 100644
--- a/system/OpenglSystemCommon/VirtioGpuStream.cpp
+++ b/system/OpenglSystemCommon/VirtioGpuStream.cpp
@@ -15,8 +15,8 @@
*/
#include "VirtioGpuStream.h"
+#include "virtgpu_drm.h"
-#include <virtgpu_drm.h>
#include <xf86drm.h>
#include <sys/types.h>
diff --git a/system/codecs/c2/decoders/base/color_buffer_utils.cpp b/system/codecs/c2/decoders/base/color_buffer_utils.cpp
index 36aa336..a36ba32 100644
--- a/system/codecs/c2/decoders/base/color_buffer_utils.cpp
+++ b/system/codecs/c2/decoders/base/color_buffer_utils.cpp
@@ -19,10 +19,10 @@
#include <android-base/strings.h>
#include <log/log.h>
#include <gralloc_cb_bp.h>
-#include <drm/virtgpu_drm.h>
#include <xf86drm.h>
#include "cros_gralloc_handle.h"
+#include "virtgpu_drm.h"
static bool isMinigbmFromProperty() {
static constexpr const auto kGrallocProp = "ro.hardware.gralloc";
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index 4907bb2..fc3d0a9 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -48,9 +48,11 @@
#include <GLES3/gl31.h>
#ifdef VIRTIO_GPU
-#include <drm/virtgpu_drm.h>
#include <xf86drm.h>
#include <poll.h>
+
+#include "virtgpu_drm.h"
+
#endif // VIRTIO_GPU
#ifdef GFXSTREAM
diff --git a/system/hwc2/virtgpu_drm.h b/system/hwc2/virtgpu_drm.h
deleted file mode 120000
index b85a9f4..0000000
--- a/system/hwc2/virtgpu_drm.h
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/GoldfishAddressSpace/include/virtgpu_drm.h
\ No newline at end of file
diff --git a/shared/GoldfishAddressSpace/include/virtgpu_drm.h b/system/include/virtgpu_drm.h
similarity index 100%
rename from shared/GoldfishAddressSpace/include/virtgpu_drm.h
rename to system/include/virtgpu_drm.h
diff --git a/system/vulkan_enc/virtgpu_drm.h b/system/vulkan_enc/virtgpu_drm.h
deleted file mode 120000
index b85a9f4..0000000
--- a/system/vulkan_enc/virtgpu_drm.h
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/GoldfishAddressSpace/include/virtgpu_drm.h
\ No newline at end of file
