From d54132c745d8b70c06574c1a1cd020e2725fe5d6 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 20 Oct 2020 13:50:16 -0700 Subject: [PATCH] Revert "Define SK_VULKAN for clang-tidy runs (#21927)" This breaks linting on other targets that include skia headers that do ifdef checks on SK_VULKAN. This reverts commit 25d8fa5a79cb0228e639601822598ada49695ff6. --- ci/bin/lint.dart | 6 ------ vulkan/vulkan_window.cc | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/bin/lint.dart b/ci/bin/lint.dart index 2f2f98abf2c8c..695473265701a 100644 --- a/ci/bin/lint.dart +++ b/ci/bin/lint.dart @@ -28,11 +28,6 @@ https://github.com/flutter/flutter/wiki/Engine-Clang-Tidy-Linter const String issueUrlPrefix = 'https://github.com/flutter/flutter/issues'; -/// Symbol definitions passed to clang-tidy. -const List clangTidyDefineArgs = [ - "-DSK_VULKAN", // See: https://github.com/flutter/flutter/issues/68331 -]; - class Command { Directory directory = Directory(''); String command = ''; @@ -51,7 +46,6 @@ String calcTidyArgs(Command command) { String result = command.command; result = result.replaceAll(RegExp(r'\S*clang/bin/clang'), ''); result = result.replaceAll(RegExp(r'-MF \S*'), ''); - result += ' ' + clangTidyDefineArgs.join(' '); return result; } diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc index 49f8e5d606bcd..2c4618f06e796 100644 --- a/vulkan/vulkan_window.cc +++ b/vulkan/vulkan_window.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/68331 + #include "vulkan_window.h" #include