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}
This commit is contained in:
Etienne Dechamps
Chromium LUCI CQ
parent
22dd106294
commit
9760d7df0b
build_overrides
infra/config
generated/builders
ci
android-cronet-arm-dbg
android-cronet-arm-rel
android-cronet-arm64-dbg
android-cronet-arm64-gn2bp-dbg
android-cronet-arm64-rel
android-cronet-asan-arm-rel
android-cronet-asan-x86-rel
android-cronet-code-coverage-java
android-cronet-code-coverage-native
android-cronet-mainline-clang-arm64-dbg
android-cronet-mainline-clang-arm64-rel
android-cronet-mainline-clang-riscv64-dbg
android-cronet-mainline-clang-riscv64-rel
android-cronet-mainline-clang-x86-dbg
android-cronet-mainline-clang-x86-rel
android-cronet-marshmallow-arm64-perf-rel
android-cronet-riscv64-dbg
android-cronet-riscv64-rel
android-cronet-x64-dbg
android-cronet-x64-rel
android-cronet-x86-dbg
android-cronet-x86-rel
try
android-cronet-arm-dbg
android-cronet-arm-rel
android-cronet-arm64-dbg
android-cronet-arm64-gn2bp-dbg
android-cronet-arm64-rel
android-cronet-asan-arm-rel
android-cronet-mainline-clang-arm64-dbg
android-cronet-mainline-clang-arm64-rel
android-cronet-mainline-clang-riscv64-dbg
android-cronet-mainline-clang-riscv64-rel
android-cronet-mainline-clang-x86-dbg
android-cronet-mainline-clang-x86-rel
android-cronet-riscv64-dbg
android-cronet-riscv64-rel
android-cronet-x64-dbg-12-tests
android-cronet-x64-dbg-13-tests
android-cronet-x64-dbg-14-tests
android-cronet-x64-dbg-15-tests
android-cronet-x64-dbg
android-cronet-x64-rel
android-cronet-x86-dbg-10-tests
android-cronet-x86-dbg-11-tests
android-cronet-x86-dbg-marshmallow-tests
android-cronet-x86-dbg-nougat-tests
android-cronet-x86-dbg-oreo-tests
android-cronet-x86-dbg-pie-tests
android-cronet-x86-dbg
android-cronet-x86-rel
gn_args
tools/mb
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user