From 9760d7df0b825616d21743c30c0dbf717c7ef132 Mon Sep 17 00:00:00 2001
From: Etienne Dechamps <edechamps@google.com>
Date: Thu, 20 Mar 2025 09:23:30 -0700
Subject: [PATCH] Deduce enable_base_tracing from is_cronet_build
This will make it simpler for Cronet to flip enable_base_tracing, and is
one step towards the general direction of simplifying Cronet's gn args
(i.e. ideally, we should simply set is_cronet_build and everything else
should be derived from that).
Bug: b:346770535, 40287068
Change-Id: Ia969f5abcd2404d349cb73ef574ccd5caf112533
q-Include-Trybots: luci.chromium.try:android-cronet-x64-dbg-15-tests,android-cronet-x86-dbg-marshmallow-tests
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6375211
Commit-Queue: Etienne Dechamps <edechamps@google.com>
Reviewed-by: Stefano Duo <stefanoduo@google.com>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1435479}
---
build_overrides/build.gni | 3 ++-
.../generated/builders/ci/android-cronet-arm-dbg/gn-args.json | 1 -
.../generated/builders/ci/android-cronet-arm-rel/gn-args.json | 1 -
.../builders/ci/android-cronet-arm64-dbg/gn-args.json | 1 -
.../builders/ci/android-cronet-arm64-gn2bp-dbg/gn-args.json | 1 -
.../builders/ci/android-cronet-arm64-rel/gn-args.json | 1 -
.../builders/ci/android-cronet-asan-arm-rel/gn-args.json | 1 -
.../builders/ci/android-cronet-asan-x86-rel/gn-args.json | 1 -
.../builders/ci/android-cronet-code-coverage-java/gn-args.json | 1 -
.../ci/android-cronet-code-coverage-native/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-arm64-dbg/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-arm64-rel/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-riscv64-dbg/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-riscv64-rel/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-x86-dbg/gn-args.json | 1 -
.../ci/android-cronet-mainline-clang-x86-rel/gn-args.json | 1 -
.../ci/android-cronet-marshmallow-arm64-perf-rel/gn-args.json | 1 -
.../builders/ci/android-cronet-riscv64-dbg/gn-args.json | 1 -
.../builders/ci/android-cronet-riscv64-rel/gn-args.json | 1 -
.../generated/builders/ci/android-cronet-x64-dbg/gn-args.json | 1 -
.../generated/builders/ci/android-cronet-x64-rel/gn-args.json | 1 -
.../generated/builders/ci/android-cronet-x86-dbg/gn-args.json | 1 -
.../generated/builders/ci/android-cronet-x86-rel/gn-args.json | 1 -
.../generated/builders/try/android-cronet-arm-dbg/gn-args.json | 1 -
.../generated/builders/try/android-cronet-arm-rel/gn-args.json | 1 -
.../builders/try/android-cronet-arm64-dbg/gn-args.json | 1 -
.../builders/try/android-cronet-arm64-gn2bp-dbg/gn-args.json | 1 -
.../builders/try/android-cronet-arm64-rel/gn-args.json | 1 -
.../builders/try/android-cronet-asan-arm-rel/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-arm64-dbg/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-arm64-rel/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-riscv64-dbg/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-riscv64-rel/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-x86-dbg/gn-args.json | 1 -
.../try/android-cronet-mainline-clang-x86-rel/gn-args.json | 1 -
.../builders/try/android-cronet-riscv64-dbg/gn-args.json | 1 -
.../builders/try/android-cronet-riscv64-rel/gn-args.json | 1 -
.../builders/try/android-cronet-x64-dbg-12-tests/gn-args.json | 1 -
.../builders/try/android-cronet-x64-dbg-13-tests/gn-args.json | 1 -
.../builders/try/android-cronet-x64-dbg-14-tests/gn-args.json | 1 -
.../builders/try/android-cronet-x64-dbg-15-tests/gn-args.json | 1 -
.../generated/builders/try/android-cronet-x64-dbg/gn-args.json | 1 -
.../generated/builders/try/android-cronet-x64-rel/gn-args.json | 1 -
.../builders/try/android-cronet-x86-dbg-10-tests/gn-args.json | 1 -
.../builders/try/android-cronet-x86-dbg-11-tests/gn-args.json | 1 -
.../try/android-cronet-x86-dbg-marshmallow-tests/gn-args.json | 1 -
.../try/android-cronet-x86-dbg-nougat-tests/gn-args.json | 1 -
.../try/android-cronet-x86-dbg-oreo-tests/gn-args.json | 1 -
.../builders/try/android-cronet-x86-dbg-pie-tests/gn-args.json | 1 -
.../generated/builders/try/android-cronet-x86-dbg/gn-args.json | 1 -
.../generated/builders/try/android-cronet-x86-rel/gn-args.json | 1 -
infra/config/gn_args/gn_args.star | 1 -
tools/mb/mb_config.pyl | 1 -
tools/mb/mb_config_expectations/chromium.infra.codesearch.json | 1 -
54 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index d45195f0a2df7..3b0039c472c6e 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -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/cronet/config.gni")
import("//build/config/features.gni")
import("//build/config/gclient_args.gni")
@@ -36,7 +37,7 @@ declare_args() {
# altogether, in which case all tracing instrumentation in //base becomes a
# no-op.
# TODO(crbug.com/40124378): Add dependency on perfetto to support typed events.
- enable_base_tracing = true
+ enable_base_tracing = !is_cronet_build
# Limits the defined //third_party/android_deps targets to only "buildCompile"
# and "buildCompileNoDeps" targets. This is useful for third-party
diff --git a/infra/config/generated/builders/ci/android-cronet-arm-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-arm-dbg/gn-args.json
index 00d647a84a46b..5b51edf32aa69 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm-dbg/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-arm-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-arm-rel/gn-args.json
index 50d19de5b82da..0d8313472a837 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm-rel/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-arm64-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-arm64-dbg/gn-args.json
index 5848e38976779..397b2b76ded6f 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm64-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-arm64-gn2bp-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-arm64-gn2bp-dbg/gn-args.json
index 5848e38976779..397b2b76ded6f 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm64-gn2bp-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm64-gn2bp-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-arm64-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-arm64-rel/gn-args.json
index 47e99f431cebe..e8af1b034e5d1 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm64-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-asan-arm-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-asan-arm-rel/gn-args.json
index dec43e3368f64..56ac6cbd1172a 100644
--- a/infra/config/generated/builders/ci/android-cronet-asan-arm-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-asan-arm-rel/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 27,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-asan-x86-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-asan-x86-rel/gn-args.json
index 5f2fa1c77bf99..114fc7ff78aeb 100644
--- a/infra/config/generated/builders/ci/android-cronet-asan-x86-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-asan-x86-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-code-coverage-java/gn-args.json b/infra/config/generated/builders/ci/android-cronet-code-coverage-java/gn-args.json
index a6b721e881211..cb0018c2c61ec 100644
--- a/infra/config/generated/builders/ci/android-cronet-code-coverage-java/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-code-coverage-java/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-code-coverage-native/gn-args.json b/infra/config/generated/builders/ci/android-cronet-code-coverage-native/gn-args.json
index 476e04981c724..0784624a968e9 100644
--- a/infra/config/generated/builders/ci/android-cronet-code-coverage-native/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-code-coverage-native/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-dbg/gn-args.json
index 8b4798c6d7968..716f1f5efbf49 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-rel/gn-args.json
index 8dfcdf8380f50..ca44ac5477bfb 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-arm64-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
index 2737cac2eedb0..a8a5efa7660cc 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-rel/gn-args.json
index ab10dcbea2e98..d3c740d532bd2 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-riscv64-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/gn-args.json
index 4a0dd81d064de..1b0d17450952f 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-rel/gn-args.json
index d30ce573acae6..d4df534fd0b5f 100644
--- a/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-marshmallow-arm64-perf-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-marshmallow-arm64-perf-rel/gn-args.json
index 47e99f431cebe..e8af1b034e5d1 100644
--- a/infra/config/generated/builders/ci/android-cronet-marshmallow-arm64-perf-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-marshmallow-arm64-perf-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-riscv64-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-riscv64-dbg/gn-args.json
index 70d8b77453740..b020db52d1d20 100644
--- a/infra/config/generated/builders/ci/android-cronet-riscv64-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-riscv64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-riscv64-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-riscv64-rel/gn-args.json
index 0b54fa4e2b953..f24c5583d6a33 100644
--- a/infra/config/generated/builders/ci/android-cronet-riscv64-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-riscv64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-x64-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-x64-dbg/gn-args.json
index a414aa739b165..18cb18096b8c0 100644
--- a/infra/config/generated/builders/ci/android-cronet-x64-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-x64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-x64-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-x64-rel/gn-args.json
index 34b789ab3f018..3fbc71698c16d 100644
--- a/infra/config/generated/builders/ci/android-cronet-x64-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-x64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-x86-dbg/gn-args.json b/infra/config/generated/builders/ci/android-cronet-x86-dbg/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/ci/android-cronet-x86-dbg/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-x86-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/ci/android-cronet-x86-rel/gn-args.json b/infra/config/generated/builders/ci/android-cronet-x86-rel/gn-args.json
index 87e1e723adc67..f4e1f47199f79 100644
--- a/infra/config/generated/builders/ci/android-cronet-x86-rel/gn-args.json
+++ b/infra/config/generated/builders/ci/android-cronet-x86-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-arm-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-arm-dbg/gn-args.json
index 00d647a84a46b..5b51edf32aa69 100644
--- a/infra/config/generated/builders/try/android-cronet-arm-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-arm-dbg/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-arm-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-arm-rel/gn-args.json
index 327c94a90e104..01fd44165aa08 100644
--- a/infra/config/generated/builders/try/android-cronet-arm-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-arm-rel/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-arm64-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-arm64-dbg/gn-args.json
index 5848e38976779..397b2b76ded6f 100644
--- a/infra/config/generated/builders/try/android-cronet-arm64-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-arm64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-arm64-gn2bp-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-arm64-gn2bp-dbg/gn-args.json
index 5848e38976779..397b2b76ded6f 100644
--- a/infra/config/generated/builders/try/android-cronet-arm64-gn2bp-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-arm64-gn2bp-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-arm64-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-arm64-rel/gn-args.json
index 47e99f431cebe..e8af1b034e5d1 100644
--- a/infra/config/generated/builders/try/android-cronet-arm64-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-arm64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-asan-arm-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-asan-arm-rel/gn-args.json
index dec43e3368f64..56ac6cbd1172a 100644
--- a/infra/config/generated/builders/try/android-cronet-asan-arm-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-asan-arm-rel/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 27,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-dbg/gn-args.json
index 8b4798c6d7968..716f1f5efbf49 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-rel/gn-args.json
index 8dfcdf8380f50..ca44ac5477bfb 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-arm64-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
index 2737cac2eedb0..a8a5efa7660cc 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-rel/gn-args.json
index ab10dcbea2e98..d3c740d532bd2 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-riscv64-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-dbg/gn-args.json
index 4a0dd81d064de..1b0d17450952f 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-dbg/gn-args.json
@@ -6,7 +6,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-rel/gn-args.json
index d30ce573acae6..d4df534fd0b5f 100644
--- a/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-mainline-clang-x86-rel/gn-args.json
@@ -7,7 +7,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 29,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-riscv64-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-riscv64-dbg/gn-args.json
index 70d8b77453740..b020db52d1d20 100644
--- a/infra/config/generated/builders/try/android-cronet-riscv64-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-riscv64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-riscv64-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-riscv64-rel/gn-args.json
index 0b54fa4e2b953..f24c5583d6a33 100644
--- a/infra/config/generated/builders/try/android-cronet-riscv64-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-riscv64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-dbg-12-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-dbg-12-tests/gn-args.json
index a414aa739b165..18cb18096b8c0 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-dbg-12-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-dbg-12-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-dbg-13-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-dbg-13-tests/gn-args.json
index a414aa739b165..18cb18096b8c0 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-dbg-13-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-dbg-13-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-dbg-14-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-dbg-14-tests/gn-args.json
index a414aa739b165..18cb18096b8c0 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-dbg-14-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-dbg-14-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-dbg-15-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-dbg-15-tests/gn-args.json
index aa3997fc6ffe7..10ac1c689b66e 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-dbg-15-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-dbg-15-tests/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-dbg/gn-args.json
index a414aa739b165..18cb18096b8c0 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x64-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-x64-rel/gn-args.json
index 34b789ab3f018..3fbc71698c16d 100644
--- a/infra/config/generated/builders/try/android-cronet-x64-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x64-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-11-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-11-tests/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-11-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-11-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-marshmallow-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-marshmallow-tests/gn-args.json
index 6017da2cda90d..d69eb4dc386af 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-marshmallow-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-marshmallow-tests/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-nougat-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-nougat-tests/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-nougat-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-nougat-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-oreo-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-oreo-tests/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-oreo-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-oreo-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-pie-tests/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-pie-tests/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg-pie-tests/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-pie-tests/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-dbg/gn-args.json
index 74c6bfc05657c..edb06acbe7d0b 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-dbg/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg/gn-args.json
@@ -4,7 +4,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/generated/builders/try/android-cronet-x86-rel/gn-args.json b/infra/config/generated/builders/try/android-cronet-x86-rel/gn-args.json
index 87e1e723adc67..f4e1f47199f79 100644
--- a/infra/config/generated/builders/try/android-cronet-x86-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-cronet-x86-rel/gn-args.json
@@ -5,7 +5,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
diff --git a/infra/config/gn_args/gn_args.star b/infra/config/gn_args/gn_args.star
index cfb7e0c8af69f..13958c8a34000 100644
--- a/infra/config/gn_args/gn_args.star
+++ b/infra/config/gn_args/gn_args.star
@@ -416,7 +416,6 @@ gn_args.config(
"enable_reporting": True,
"use_hashed_jni_names": True,
"default_min_sdk_version": 23,
- "enable_base_tracing": False,
"clang_use_default_sample_profile": False,
"media_use_ffmpeg": False,
# https://crbug.com/1136963
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 6e6df558cf072..f0b02ea4db6fc 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -829,7 +829,6 @@
'gn_args': ('use_partition_alloc=false enable_reporting=true '
'use_hashed_jni_names=true '
'default_min_sdk_version=23 '
- 'enable_base_tracing=false '
'clang_use_default_sample_profile=false '
'media_use_ffmpeg = false'
'use_thin_lto=false ' # https://crbug.com/1136963
diff --git a/tools/mb/mb_config_expectations/chromium.infra.codesearch.json b/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
index adc3191f0e185..145dbb62bc571 100644
--- a/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
+++ b/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
@@ -35,7 +35,6 @@
"debuggable_apks": false,
"default_min_sdk_version": 23,
"disable_file_support": true,
- "enable_base_tracing": false,
"enable_kythe_annotations": true,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,