Skip to content
Snippets Groups Projects
Commit 14c1084f authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1679938 - Don't recurse the build into mfbt for projects that don't need...

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
parent e2c5b3cb
No related branches found
No related tags found
1 merge request!200Draft: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
......@@ -23,6 +23,7 @@ DIRS += [
'/config/external/nspr',
'/config/external/zlib',
'/memory',
'/mfbt',
'/mozglue',
]
......
......@@ -12,4 +12,5 @@ EXPORTS.mozilla += [
DIRS += [
'/memory',
'/mfbt',
]
......@@ -170,8 +170,6 @@ UNIFIED_SOURCES += [
if CONFIG["MOZ_BUILD_APP"] not in (
"memory",
"tools/crashreporter",
"tools/update-packaging",
"tools/update-programs",
):
# Building MFBT tests adds a large overhead when building.
......
......@@ -6,9 +6,9 @@
#ifndef MOZZCONF_H
#define MOZZCONF_H
#if defined(ZLIB_IN_MOZGLUE)
#include "mozilla/Types.h"
#if defined(ZLIB_IN_MOZGLUE)
#define ZEXTERN MFBT_API
#endif
......
......@@ -171,10 +171,6 @@ if not CONFIG["JS_STANDALONE"] or not CONFIG["MOZ_BUILD_APP"]:
GENERATED_FILES["buildid.h"].script = "build/variables.py:buildid_header"
GENERATED_FILES["source-repo.h"].script = "build/variables.py:source_repo_header"
DIRS += [
"mfbt",
]
if CONFIG["MOZ_BUILD_APP"]:
# Bring in the configuration for the configured application.
include("/" + CONFIG["MOZ_BUILD_APP"] + "/app.mozbuild")
......
......@@ -15,7 +15,6 @@ job-defaults:
resources:
- 'build/moz.configure'
- 'config/external/zlib'
- 'mfbt'
- 'moz.configure'
- 'toolkit/crashreporter'
- 'toolkit/crashreporter/google-breakpad/src/common'
......
......@@ -92,7 +92,6 @@ linux64-mar-tools:
toolchain-artifact: public/build/mar-tools.tar.xz
resources:
- build/moz.configure
- mfbt
- modules/libmar/
- moz.configure
- other-licenses/bsdiff/
......
......@@ -33,6 +33,7 @@ if CONFIG['MOZ_UPDATER']:
'/config/external/sqlite',
'/config/external/zlib',
'/memory',
'/mfbt',
'/mozglue',
'/security',
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment