Commit 18174a2b authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
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 257f86ea

browser/app/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,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
@@ -160,10 +160,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
@@ -15,7 +15,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/telemetry.py

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ def prompt_telemetry_message_contributor(): 


def initialize_telemetry_setting(settings, topsrcdir: str, state_dir: str):

    """Enables telemetry for employees or prompts the user."""

    return

    # If the user doesn't care about telemetry for this invocation, then

    # don't make requests to Bugzilla and/or prompt for whether the

    # user wants to opt-in.