commit 5047b229d8ca076d6a4631e5e58867f674a04749
author Jorge E. Moreira <jemoreira@google.com> Wed Sep 19 15:34:07 2018 -0700
committer John Stultz <john.stultz@linaro.org> Fri Dec 14 09:26:37 2018 -0800
tree 6618b735ca16bb50e684a299d34ee3261cbb79c6
parent c385afe4f7e53c4d4eff1069e48454748c2de940

drm_hwcomposer: Complete rename of DrmResources to DrmDevice

In AOSP/master, there was a structure renamed, so try to sync
AOSP/master's build fix change to freedesktop/master.

NOTE: I'm not sure how to best submit this, as the upstream
freedesktop/master may have users outside of AOSP/master. But
I'm not sure what devices on an official release are using
drm_hwc so it seems like this would be more useful then not.

Bug: 116154944
Test: builds
Change-Id: I244bd049afae6ba8310f6b6bf2d3b1ee2e891de3
Signed-off-by: John Stultz <john.stultz@linaro.org>

platformminigbm.cpp

diff --git a/platformminigbm.cpp b/platformminigbm.cpp
index 2040768..dce1d11 100644
--- a/platformminigbm.cpp
+++ b/platformminigbm.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "hwc-platform-drm-minigbm"
 
 #include "platformminigbm.h"
-#include "drmresources.h"
+#include "drmdevice.h"
 #include "platform.h"
 
 #include <drm/drm_fourcc.h>
@@ -31,7 +31,7 @@
 
 namespace android {
 
-Importer *Importer::CreateInstance(DrmResources *drm) {
+Importer *Importer::CreateInstance(DrmDevice *drm) {
   DrmMinigbmImporter *importer = new DrmMinigbmImporter(drm);
   if (!importer)
     return NULL;
@@ -45,7 +45,7 @@
   return importer;
 }
 
-DrmMinigbmImporter::DrmMinigbmImporter(DrmResources *drm)
+DrmMinigbmImporter::DrmMinigbmImporter(DrmDevice *drm)
     : DrmGenericImporter(drm), drm_(drm) {
 }
 
@@ -100,7 +100,7 @@
   return ret;
 }
 
-std::unique_ptr<Planner> Planner::CreateInstance(DrmResources *) {
+std::unique_ptr<Planner> Planner::CreateInstance(DrmDevice *) {
   std::unique_ptr<Planner> planner(new Planner);
   planner->AddStage<PlanStageGreedy>();
   return planner;