From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- toolkit/moz.configure | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'toolkit/moz.configure') diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 3e89ca77de..6ad16dc1b7 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -114,6 +114,16 @@ set_config("MOZ_GECKO_PROFILER", gecko_profiler_define) set_define("MOZ_GECKO_PROFILER", gecko_profiler_define) +# Enable perfetto on Android if gecko profiling is enabled and only for +# nightly builds. Linux support requires at least linux-headers-3.18 for +set_config( + "MOZ_PERFETTO", gecko_profiler_define, when=target_is_android & milestone.is_nightly +) +set_define( + "MOZ_PERFETTO", gecko_profiler_define, when=target_is_android & milestone.is_nightly +) + + # Whether code to parse ELF binaries should be compiled for the Gecko profiler # (for symbol table dumping). @depends(gecko_profiler, target) @@ -965,6 +975,19 @@ project_flag( set_as_define=True, ) +# Profile Management +# ============================================================== +# Selectable profiles are temporarily gated behind a build flag +# while we build and stabilize the backend (bug 1893315). + +option( + env="MOZ_SELECTABLE_PROFILES", + help="Enable experimental and unstable profile groups", +) + + +set_define("MOZ_SELECTABLE_PROFILES", True, when="MOZ_SELECTABLE_PROFILES") + project_flag( "MOZ_DEDICATED_PROFILES", help="Enable dedicated profiles per install", -- cgit v1.2.3