Commit 4d1da2c4 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Dan Ballard
Browse files

Tweaks to the build system 

Bug 40857: Modified the fat .aar creation file

This is a workaround to build fat .aars with the compiling enviornment
disabled.
Mozilla does not use a similar configuration, but either runs a Firefox
build and discards its output, or uses artifacts build.

We might switch to artifact builds too, and drop this patch, or write a
better one to upstream. But until then we need this patch.

See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.

Bug 41458: Prevent `mach package-multi-locale` from actually creating a package

macOS builds need some files to be moved around with
./mach package-multi-locale to create multi-locale packages.
The required command isn't exposed through any other mach command.
So, we patch package-multi-locale both to prevent it from failing when
doing official builds and to detect any future changes on it.
parent 077f5fc3

browser/app/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ if CONFIG["OS_ARCH"] == "WINNT": 
    RCINCLUDE = "splash.rc"

    DIRS += [

        "installation_dir_layout",

        "pbproxy",

        # tor-browser#41798 don't build private_browsing.exe on Windows

        # "pbproxy",

        "winlauncher",

    ]

    USE_LIBS += [

browser/installer/package-manifest.in

+4 −4
Original line number Diff line number Diff line
@@ -152,10 +152,10 @@ 
@BINPATH@/firefox.VisualElementsManifest.xml

@BINPATH@/browser/VisualElements/VisualElements_150.png

@BINPATH@/browser/VisualElements/VisualElements_70.png

@BINPATH@/private_browsing.exe

@BINPATH@/private_browsing.VisualElementsManifest.xml

@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png

@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png

; @BINPATH@/private_browsing.exe

; @BINPATH@/private_browsing.VisualElementsManifest.xml

; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png

; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png

#else

#ifndef XP_MACOSX

@BINPATH@/@MOZ_APP_NAME@-bin

mobile/android/gradle/with_gecko_binaries.gradle

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ def hasCompileArtifacts() { 
}



ext.configureVariantWithGeckoBinaries = { variant ->

    if (hasCompileArtifacts()) {

    if (hasCompileArtifacts() || true) {

        // Local (read, not 'official') builds want to reflect developer changes to

        // the omnijar sources, and (when compiling) to reflect developer changes to

        // the native binaries.  To do this, the Gradle build calls out to the

mobile/android/mach_commands.py

+1 −2
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ def android_archive_geckoview(command_context, args): 


    if ret != 0:

        return ret

    if "MOZ_AUTOMATION" in os.environ:

    create_maven_archive(command_context.topobjdir)



    return 0

python/mach/mach/sentry.py

+7 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import sys 
from pathlib import Path

from threading import Thread



import sentry_sdk

# import sentry_sdk

from mozversioncontrol import (

    InvalidRepoPath,

    MissingUpstreamRepo,
@@ -35,7 +35,8 @@ class SentryErrorReporter(ErrorReporter): 
    """Reports errors using Sentry."""



    def report_exception(self, exception):

        return sentry_sdk.capture_exception(exception)

        pass

        # return sentry_sdk.capture_exception(exception)





class NoopErrorReporter(ErrorReporter):
@@ -61,10 +62,10 @@ def register_sentry(argv, settings, topsrcdir: Path): 
    )

    _is_unmodified_mach_core_thread.start()



    sentry_sdk.init(

        _SENTRY_DSN, before_send=lambda event, _: _process_event(event, topsrcdir)

    )

    sentry_sdk.add_breadcrumb(message="./mach {}".format(" ".join(argv)))

    # sentry_sdk.init(

    #     _SENTRY_DSN, before_send=lambda event, _: _process_event(event, topsrcdir)

    # )

    # sentry_sdk.add_breadcrumb(message="./mach {}".format(" ".join(argv)))

    return SentryErrorReporter()