Propagate gpu_mode presence from cvd canonical configs

Databean · Databean · commit bfe76ba14c6e · 2025-04-04T20:38:21.000Z
This uses the "unset" keyword to let the layer below decide what default
to apply, which can be influenced by legacy config.json values. This is
load-bearing for some tests in CI.

Bug: b/408472915
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_graphics_configs.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_graphics_configs.cpp
@@ -91,10 +91,15 @@ bool RecordScreen(const Instance& instance) {
 }
 
 std::string GpuMode(const Instance& instance) {
-  if (instance.graphics().has_gpu_mode()) {
+  if (instance.graphics().has_gpu_mode() &&
+      instance.graphics().gpu_mode() != "") {
     return instance.graphics().gpu_mode();
+  } else {
+    // Use the instance default
+    // https://github.com/google/android-cuttlefish/blob/c4f1643479f98bdc7310d281e81751188595233b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc#L948
+    // See also b/406464352#comment7
+    return "unset";
   }
-  return CF_DEFAULTS_GPU_MODE;
 }
 
 Result<std::vector<std::string>> GenerateGraphicsFlags(

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,15 @@ bool RecordScreen(const Instance& instance) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`std::string GpuMode(const Instance& instance) {`
`94`		`- if (instance.graphics().has_gpu_mode()) {`
	`94`	`+ if (instance.graphics().has_gpu_mode() &&`
	`95`	`+ instance.graphics().gpu_mode() != "") {`
`95`	`96`	`return instance.graphics().gpu_mode();`
	`97`	`+ } else {`
	`98`	`+ // Use the instance default`
	`99`	`+ // https://github.com/google/android-cuttlefish/blob/c4f1643479f98bdc7310d281e81751188595233b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc#L948`
	`100`	`+ // See also b/406464352#comment7`
	`101`	`+ return "unset";`
`96`	`102`	`}`
`97`		`- return CF_DEFAULTS_GPU_MODE;`
`98`	`103`	`}`
`99`	`104`
`100`	`105`	`Result<std::vector<std::string>> GenerateGraphicsFlags(`