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

Commit 56f399a

Browse files
authored
Revert "Define SK_VULKAN for clang-tidy runs (#21927)" (#22012)
This breaks linting on other targets that include skia headers that do ifdef checks on SK_VULKAN. This reverts commit 25d8fa5.
1 parent 638c182 commit 56f399a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ci/bin/lint.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ https://github.com/flutter/flutter/wiki/Engine-Clang-Tidy-Linter
2828

2929
const String issueUrlPrefix = 'https://github.com/flutter/flutter/issues';
3030

31-
/// Symbol definitions passed to clang-tidy.
32-
const List<String> clangTidyDefineArgs = <String>[
33-
"-DSK_VULKAN", // See: https://github.com/flutter/flutter/issues/68331
34-
];
35-
3631
class Command {
3732
Directory directory = Directory('');
3833
String command = '';
@@ -51,7 +46,6 @@ String calcTidyArgs(Command command) {
5146
String result = command.command;
5247
result = result.replaceAll(RegExp(r'\S*clang/bin/clang'), '');
5348
result = result.replaceAll(RegExp(r'-MF \S*'), '');
54-
result += ' ' + clangTidyDefineArgs.join(' ');
5549
return result;
5650
}
5751

vulkan/vulkan_window.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/68331
6+
57
#include "vulkan_window.h"
68

79
#include <memory>

0 commit comments

Comments
 (0)