Skip to content

Commit

Permalink
Revert "Define SK_VULKAN for clang-tidy runs (flutter#21927)" (flutte…
Browse files Browse the repository at this point in the history
…r#22012)

This breaks linting on other targets that include skia headers that do
ifdef checks on SK_VULKAN.

This reverts commit 25d8fa5.
  • Loading branch information
cbracken authored Oct 20, 2020
1 parent 638c182 commit 56f399a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 0 additions & 6 deletions ci/bin/lint.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> clangTidyDefineArgs = <String>[
"-DSK_VULKAN", // See: https://github.com/flutter/flutter/issues/68331
];

class Command {
Directory directory = Directory('');
String command = '';
Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions vulkan/vulkan_window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
Expand Down

0 comments on commit 56f399a

Please sign in to comment.