Skip to content

Commit 14c1084

Browse files
committed
Bug 1679938 - Don't recurse the build into mfbt for projects that don't need it. r=firefox-build-system-reviewers,mhentges
While all toolkit and js-based projects make use of mfbt, some others, like tools/crashreporter and tools/update-packaging, don't. So instead of including mfbt from the top-level directory, include it from the relevant project top-level mozbuilds. This allows to remove the dependency on mfbt files in the hash for the minidump-stackwalk and mar-tools toolchains. Differential Revision: https://phabricator.services.mozilla.com/D98378
1 parent e2c5b3c commit 14c1084

File tree

8 files changed

+4
-9
lines changed

8 files changed

+4
-9
lines changed

js/app.mozbuild

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ DIRS += [
2323
'/config/external/nspr',
2424
'/config/external/zlib',
2525
'/memory',
26+
'/mfbt',
2627
'/mozglue',
2728
]
2829

memory/app.mozbuild

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ EXPORTS.mozilla += [
1212

1313
DIRS += [
1414
'/memory',
15+
'/mfbt',
1516
]

mfbt/moz.build

-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ UNIFIED_SOURCES += [
170170

171171
if CONFIG["MOZ_BUILD_APP"] not in (
172172
"memory",
173-
"tools/crashreporter",
174-
"tools/update-packaging",
175173
"tools/update-programs",
176174
):
177175
# Building MFBT tests adds a large overhead when building.

modules/zlib/src/mozzconf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef MOZZCONF_H
77
#define MOZZCONF_H
88

9+
#if defined(ZLIB_IN_MOZGLUE)
910
#include "mozilla/Types.h"
1011

11-
#if defined(ZLIB_IN_MOZGLUE)
1212
#define ZEXTERN MFBT_API
1313
#endif
1414

moz.build

-4
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ if not CONFIG["JS_STANDALONE"] or not CONFIG["MOZ_BUILD_APP"]:
171171
GENERATED_FILES["buildid.h"].script = "build/variables.py:buildid_header"
172172
GENERATED_FILES["source-repo.h"].script = "build/variables.py:source_repo_header"
173173

174-
DIRS += [
175-
"mfbt",
176-
]
177-
178174
if CONFIG["MOZ_BUILD_APP"]:
179175
# Bring in the configuration for the configured application.
180176
include("/" + CONFIG["MOZ_BUILD_APP"] + "/app.mozbuild")

taskcluster/ci/toolchain/minidump_stackwalk.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ job-defaults:
1515
resources:
1616
- 'build/moz.configure'
1717
- 'config/external/zlib'
18-
- 'mfbt'
1918
- 'moz.configure'
2019
- 'toolkit/crashreporter'
2120
- 'toolkit/crashreporter/google-breakpad/src/common'

taskcluster/ci/toolchain/misc.yml

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ linux64-mar-tools:
9292
toolchain-artifact: public/build/mar-tools.tar.xz
9393
resources:
9494
- build/moz.configure
95-
- mfbt
9695
- modules/libmar/
9796
- moz.configure
9897
- other-licenses/bsdiff/

tools/update-programs/app.mozbuild

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if CONFIG['MOZ_UPDATER']:
3333
'/config/external/sqlite',
3434
'/config/external/zlib',
3535
'/memory',
36+
'/mfbt',
3637
'/mozglue',
3738
'/security',
3839
]

0 commit comments

Comments
 (0)