From 2ea54ec7512e8871cdbeb67fc4f8ceaccccd1654 Mon Sep 17 00:00:00 2001
From: Jason Macnak <natsu@google.com>
Date: Wed, 1 Jul 2026 16:56:46 -0700
Subject: [PATCH] Ignore unknown fields in graphics detector parsing

... to stay in sync with ag/40769486.

Also, adds error collecting to potentially help in the future.

Bug: b/530288420
Test: cvd create
---
 .../host/commands/assemble_cvd/BUILD.bazel    |  1 +
 .../commands/assemble_cvd/graphics_flags.cc   | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
index 928ad96f2f3..bebd1802d46 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -444,6 +444,7 @@ cf_cc_library(
         "@abseil-cpp//absl/strings",
         "@fmt",
         "@protobuf",
+        "@protobuf//src/google/protobuf/io:tokenizer",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
index 2697b976488..473e4c64da1 100644
--- a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
+++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
@@ -26,6 +26,7 @@
 #include "absl/strings/str_split.h"
 #include "android-base/file.h"
 #include "fmt/format.h"
+#include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/text_format.h"
 
 #include "cuttlefish/common/libs/utils/contains.h"
@@ -52,6 +53,23 @@
 namespace cuttlefish {
 namespace {
 
+struct AggregatingErrorCollector : public google::protobuf::io::ErrorCollector {
+  void RecordError(int /* line */, int /* column */,
+                   const absl::string_view message) override {
+    if (!error_message.empty()) {
+      absl::StrAppend(&error_message, "; ");
+    }
+    absl::StrAppend(&error_message, message);
+  }
+
+  void RecordWarning(int /* line */, int /* column */,
+                     const absl::string_view /* message */) override {
+    // Ignore warnings
+  }
+
+  std::string error_message;
+};
+
 struct CommonState {
   const VmmMode vmm_mode;
   const GuestConfig& guest_config;
@@ -762,10 +780,15 @@ GetGraphicsAvailabilityWithSubprocessCheck() {
       graphics_availability_content_result.value();
 
   gfxstream::proto::GraphicsAvailability availability;
+
   google::protobuf::TextFormat::Parser parser;
+  parser.AllowUnknownField(true);
+  AggregatingErrorCollector error_collector;
+  parser.RecordErrorsTo(&error_collector);
   if (!parser.ParseFromString(graphics_availability_content, &availability)) {
     LOG(ERROR) << "Failed to parse graphics detector output: "
                << graphics_availability_content
+               << ". Error(s): " << error_collector.error_message
                << ". Assuming no availability.";
     return {};
   }