From a55f5030a10a20afe99104029e154d45c8be9f98 Mon Sep 17 00:00:00 2001 From: Dirk Pranke Date: Wed, 4 Nov 2020 23:56:53 +0000 Subject: Change actions to python2_actions as needed. As a prelude to starting to move the build fully over to Python 3, this CL changes all of the GN `action` and `action_foreach` targets that appear to require Python 2 over to `python2_action` and `python2_action_foreach`. This CL by itself should produce no functional change since we'll still be using Python 2 by default, and the new templates are passthroughs in that config. To start using Python3, you can run `gn gen --script-executable=python3 //out/Default` on Unix; on Python3 you need to point to an actual python3.exe and not the python3.bat wrapper in depot_tools; once we can roll GN forward to a version that contains https://gn-review.googlesource.com/c/gn/+/10560 (which will hopefully happen in the next day or two), that won't be necessary. The Fuchsia build will not work until http://fxrev.dev/446479 lands and is rolled in. No-Presubmit: true Bug: 1112471 AX-Relnotes: n/a Change-Id: I891155502e0940a8075cf26d675f54b803d91242 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510878 Reviewed-by: Scott Violet Reviewed-by: Bruce Dawson Reviewed-by: Mark Mentovai Reviewed-by: Andrew Grieve Commit-Queue: Dirk Pranke Cr-Commit-Position: refs/heads/master@{#824216} NOKEYCHECK=True GitOrigin-RevId: ca35ab2022b017562b9ad3d12fea3f149d18cf87 --- fuzzers/BUILD.gn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'fuzzers/BUILD.gn') diff --git a/fuzzers/BUILD.gn b/fuzzers/BUILD.gn index 90c436e..613ac99 100644 --- a/fuzzers/BUILD.gn +++ b/fuzzers/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/python.gni") import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") @@ -71,7 +72,8 @@ proto_library("zucchini_file_pair_proto") { # Disabled on Windows due to crbug/844826. if (current_toolchain == host_toolchain && !is_win) { # Raw Apply Fuzzer Seed: - action("zucchini_raw_apply_seed") { + # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. + python2_action("zucchini_raw_apply_seed") { script = "generate_fuzzer_data.py" args = [ @@ -107,7 +109,8 @@ if (current_toolchain == host_toolchain && !is_win) { } # ZTF Apply Fuzzer Seed: - action("zucchini_ztf_apply_seed") { + # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. + python2_action("zucchini_ztf_apply_seed") { script = "generate_fuzzer_data.py" # *.ztf files are expected to be valid ZTF format. -- cgit v1.2.3