Remove Cuttlefish's DeviceConfig from Ranchu HWC

... as Cuttlefish instances all use the DRM mode now.

(noticed while starting to clean up conversion warnings)

Bug: b/316204299
Test: cvd start
Change-Id: I3317fdd935961d90901577f014d729d3c2e2c2b1

5 files changed, 0 insertions, 61 deletions

diff --git a/system/hwc3/Android.bp b/system/hwc3/Android.bp
index 71c8d220..45e122c2 100644
--- a/system/hwc3/Android.bp
+++ b/system/hwc3/Android.bp
@@ -34,8 +34,6 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "libcutils",
-        "libcuttlefish_device_config",
-        "libcuttlefish_device_config_proto",
         "libdrm",
         "libgralloctypes",
         "libhidlbase",
diff --git a/system/hwc3/ClientFrameComposer.cpp b/system/hwc3/ClientFrameComposer.cpp
index 85ba90f6..af0b3278 100644
--- a/system/hwc3/ClientFrameComposer.cpp
+++ b/system/hwc3/ClientFrameComposer.cpp
@@ -20,7 +20,6 @@
 #include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <android/hardware/graphics/common/1.0/types.h>
-#include <device_config_shared.h>
 #include <drm_fourcc.h>
 #include <libyuv.h>
 #include <sync/sync.h>
diff --git a/system/hwc3/DisplayFinder.cpp b/system/hwc3/DisplayFinder.cpp
index c19502b5..edb3089b 100644
--- a/system/hwc3/DisplayFinder.cpp
+++ b/system/hwc3/DisplayFinder.cpp
@@ -19,7 +19,6 @@
 #include <android-base/parseint.h>
 #include <android-base/properties.h>
 #include <android-base/strings.h>
-#include <device_config_shared.h>
 
 #include "Common.h"
 #include "HostUtils.h"
@@ -31,37 +30,6 @@ constexpr int32_t HertzToPeriodNanos(uint32_t hertz) {
   return 1000 * 1000 * 1000 / hertz;
 }
 
-HWC3::Error findCuttlefishDisplays(std::vector<DisplayMultiConfigs>* outDisplays) {
-  DEBUG_LOG("%s", __FUNCTION__);
-
-  // TODO: replace with initializing directly from DRM info.
-  const auto deviceConfig = cuttlefish::GetDeviceConfig();
-
-  int64_t displayId = 0;
-  for (const auto& deviceDisplayConfig : deviceConfig.display_config()) {
-    const auto vsyncPeriodNanos =
-        HertzToPeriodNanos(deviceDisplayConfig.refresh_rate_hz());
-
-    DisplayMultiConfigs display = {
-        .displayId = displayId,
-        .activeConfigId = 0,
-        .configs =
-            {
-                DisplayConfig(0,                             //
-                              deviceDisplayConfig.width(),   //
-                              deviceDisplayConfig.height(),  //
-                              deviceDisplayConfig.dpi(),     //
-                              deviceDisplayConfig.dpi(),     //
-                              vsyncPeriodNanos),
-            },
-    };
-    outDisplays->push_back(display);
-    ++displayId;
-  }
-
-  return HWC3::Error::None;
-}
-
 static int getVsyncHzFromProperty() {
   static constexpr const auto kVsyncProp = "ro.boot.qemu.vsync";
 
@@ -272,8 +240,6 @@ HWC3::Error findDisplays(const DrmClient* drm,
       return HWC3::Error::NoResources;
     }
     error = findDrmDisplays(*drm, outDisplays);
-  } else if (IsCuttlefish()) {
-    error = findCuttlefishDisplays(outDisplays);
   } else {
     error = findGoldfishDisplays(outDisplays);
   }
diff --git a/system/hwc3/GuestFrameComposer.cpp b/system/hwc3/GuestFrameComposer.cpp
index b4eef6a4..8bb753c2 100644
--- a/system/hwc3/GuestFrameComposer.cpp
+++ b/system/hwc3/GuestFrameComposer.cpp
@@ -20,7 +20,6 @@
 #include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <android/hardware/graphics/common/1.0/types.h>
-#include <device_config_shared.h>
 #include <drm_fourcc.h>
 #include <libyuv.h>
 #include <sync/sync.h>
@@ -568,26 +567,6 @@ HWC3::Error GuestFrameComposer::onActiveConfigChange(Display* /*display*/) {
   return HWC3::Error::None;
 };
 
-HWC3::Error GuestFrameComposer::getDisplayConfigsFromDeviceConfig(
-    std::vector<GuestFrameComposer::DisplayConfig>* configs) {
-  DEBUG_LOG("%s", __FUNCTION__);
-
-  const auto deviceConfig = cuttlefish::GetDeviceConfig();
-  for (const auto& deviceDisplayConfig : deviceConfig.display_config()) {
-    DisplayConfig displayConfig = {
-        .width = deviceDisplayConfig.width(),
-        .height = deviceDisplayConfig.height(),
-        .dpiX = deviceDisplayConfig.dpi(),
-        .dpiY = deviceDisplayConfig.dpi(),
-        .refreshRateHz = deviceDisplayConfig.refresh_rate_hz(),
-    };
-
-    configs->push_back(displayConfig);
-  }
-
-  return HWC3::Error::None;
-}
-
 HWC3::Error GuestFrameComposer::getDisplayConfigsFromSystemProp(
     std::vector<GuestFrameComposer::DisplayConfig>* configs) {
   DEBUG_LOG("%s", __FUNCTION__);
diff --git a/system/hwc3/GuestFrameComposer.h b/system/hwc3/GuestFrameComposer.h
index 2df2f32b..4aea37a8 100644
--- a/system/hwc3/GuestFrameComposer.h
+++ b/system/hwc3/GuestFrameComposer.h
@@ -75,9 +75,6 @@ class GuestFrameComposer : public FrameComposer {
     int refreshRateHz;
   };
 
-  HWC3::Error getDisplayConfigsFromDeviceConfig(
-      std::vector<DisplayConfig>* configs);
-
   HWC3::Error getDisplayConfigsFromSystemProp(
       std::vector<DisplayConfig>* configs);