From 4e86f142098643f497389d906bbdfcd521440eb4 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Fri, 24 May 2024 09:31:04 +0000 Subject: [PATCH] Fix GN template webrtc_fuzzer_test to work with Abseil targets in deps Bug: webrtc:341803749 Change-Id: I450a19f87fa08c811579a75b20ac177a481b8162 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/351640 Reviewed-by: Mirko Bonadei Auto-Submit: Florent Castelli Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#42373} --- test/fuzzers/BUILD.gn | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index d932d86b64..5dd25b400c 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -44,7 +44,6 @@ rtc_library("fuzz_data_helper") { set_defaults("webrtc_fuzzer_test") { configs = rtc_add_configs - absl_deps = [] } template("webrtc_fuzzer_test") { @@ -56,17 +55,17 @@ template("webrtc_fuzzer_test") { ] additional_configs = configs - # If absl_deps is [], no action is needed. If not [], then it needs to be - # converted to //third_party/abseil-cpp:absl when build_with_chromium=true - # otherwise it just needs to be added to deps. - if (absl_deps != []) { - if (!defined(deps)) { + # Convert Abseil dependencies to //third_party/abseil-cpp:absl when + # build_with_chromium is true + if (build_with_chromium) { + absl_dependencies = + filter_labels_include(deps, [ "//third_party/abseil-cpp/*" ]) + if (absl_dependencies != []) { + filtered_deps = + filter_labels_exclude(deps, [ "//third_party/abseil-cpp/*" ]) deps = [] - } - if (build_with_chromium) { + deps = filtered_deps deps += [ "//third_party/abseil-cpp:absl" ] - } else { - deps += absl_deps } }