Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 3c8394c

Browse files
authored
[fuchsia] Fix SDK roll failure. (#30600)
- Remove unused zx include. This include redefines several symbols that are now coming from the SDK. See this SDK roll failure https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8826397088488060737/+/u/build_fuchsia_debug_x64_flutter_shell_platform_fuchsia:fuchsia_fuchsia_tests/stdout. This include does not appear to be used. - Replace use of non-standard countof C++ feature. This feature does not appear to be defined anymore in the latest toolchain.
1 parent 641a7a3 commit 3c8394c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

shell/platform/fuchsia/flutter/software_surface.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "third_party/skia/include/core/SkImageInfo.h"
2020

2121
#include "../runtime/dart/utils/inlines.h"
22-
#include "zx/cpp/fidl.h"
2322

2423
namespace flutter_runner {
2524

shell/platform/fuchsia/flutter/vulkan_surface_producer.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) {
131131
const char* device_extensions[] = {
132132
VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME,
133133
};
134+
const int device_extensions_count =
135+
sizeof(device_extensions) / sizeof(device_extensions[0]);
134136
GrVkExtensions vk_extensions;
135137
vk_extensions.init(backend_context.fGetProc, backend_context.fInstance,
136138
backend_context.fPhysicalDevice, 0, nullptr,
137-
countof(device_extensions), device_extensions);
139+
device_extensions_count, device_extensions);
138140
backend_context.fVkExtensions = &vk_extensions;
139141
GrContextOptions options;
140142
options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;

0 commit comments

Comments
 (0)