diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 0181bdde8f..964fe89f6c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -36,7 +36,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", - "--args=is_debug=false skia_compile_processors=true" + "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index fa8a4b29d8..fc1a199475 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -215,6 +215,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_ios_profile'] = '"Upstream Testing Provisioning Profile"' if 'CheckGeneratedFiles' in extra_tokens: args['skia_compile_processors'] = 'true' + args['skia_generate_workarounds'] = 'true' if compiler == 'Clang' and 'Win' in os: args['clang_win'] = '"%s"' % self.m.vars.slave_dir.join('clang_win') extra_cflags.append('-DDUMMY_clang_win_version=%s' % diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 7e9314a9f6..7c9fe21dab 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -188,7 +188,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", - "--args=is_debug=false skia_compile_processors=true" + "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/src/gpu/GrDriverBugWorkaroundsAutogen.h b/src/gpu/GrDriverBugWorkaroundsAutogen.h index 4ff99bb98c..87aa46172e 100644 --- a/src/gpu/GrDriverBugWorkaroundsAutogen.h +++ b/src/gpu/GrDriverBugWorkaroundsAutogen.h @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// This file is auto-generated from -// ../../tools/build_workaround_header.py +// This file is auto-generated from build_workaround_header.py // DO NOT EDIT! #define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)\ diff --git a/tools/build_workaround_header.py b/tools/build_workaround_header.py index b8558326ad..f1d45de20e 100755 --- a/tools/build_workaround_header.py +++ b/tools/build_workaround_header.py @@ -15,9 +15,9 @@ _LICENSE = """// Copyright 2018 The Chromium Authors. All rights reserved. """ -_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from\n" + - "// " + __file__ + "\n" + - "// DO NOT EDIT!\n\n") +_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from " + + os.path.basename(__file__) + "\n" + + "// DO NOT EDIT!\n\n") def merge_files_into_workarounds(files): workarounds = set() |