commit 8f89463fd7244a8be321350d6120d0d5dca8bf42
author Tamir Duberstein <tamird@google.com> Wed Apr 27 21:26:17 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 27 21:26:17 2022 +0000
tree 025380e055fd22ca3afc478fca2a4cdb0d5d8e81
parent 004149657fd8dace6fa1e807dd81af3e1f5ef71f
parent 7f3c6b0eedd074000f0ff54ab2b8a11a86d5f39c

[fuchsia] Use new field name in logger config am: 7f3c6b0eed

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2078279

Change-Id: Iadb11487ff1492e2c395d576fdd45e3d7fcf2efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

system/vulkan/goldfish_vulkan.cpp

diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp
index 5e8384b..622b5f1 100644
--- a/system/vulkan/goldfish_vulkan.cpp
+++ b/system/vulkan/goldfish_vulkan.cpp
@@ -1079,7 +1079,7 @@
 };
 
 void VulkanDevice::InitLogger() {
-  auto log_service = ([] () -> std::optional<zx::socket> {
+  auto log_socket = ([] () -> std::optional<zx::socket> {
     fidl::ClientEnd<fuchsia_logger::LogSink> channel{zx::channel{
       GetConnectToServiceFunction()("/svc/fuchsia.logger.LogSink")}};
     if (!channel.is_valid())
@@ -1097,14 +1097,16 @@
 
     return local_socket;
   })();
-  if (!log_service)
+  if (!log_socket)
     return;
 
-  fx_logger_config_t config = {.min_severity = FX_LOG_INFO,
-                               .console_fd = -1,
-                               .log_service_channel = log_service->release(),
-                               .tags = nullptr,
-                               .num_tags = 0};
+  fx_logger_config_t config = {
+      .min_severity = FX_LOG_INFO,
+      .console_fd = -1,
+      .log_sink_socket = log_socket->release(),
+      .tags = nullptr,
+      .num_tags = 0,
+  };
 
   fx_log_reconfigure(&config);
 }