Commit f61fb9dd authored by Gabriele Svelto's avatar Gabriele Svelto
Browse files

Bug 1676815 - Factorize Linux bootstrapping of Android builds r=andi DONTBUILD 

Differential Revision: https://phabricator.services.mozilla.com/D96813
parent a75b23d0

python/mozboot/mozboot/archlinux.py

+1 −13
Original line number Diff line number Diff line
@@ -116,19 +116,7 @@ class ArchlinuxBootstrapper(LinuxBootstrapper, BaseBootstrapper): 


        # 2. Android pieces.

        self.ensure_java(mozconfig_builder)

        from mozboot import android



        android.ensure_android(

            "linux", artifact_mode=artifact_mode, no_interactive=self.no_interactive

        )



    def generate_mobile_android_mozconfig(self, artifact_mode=False):

        from mozboot import android



        return android.generate_mozconfig("linux", artifact_mode=artifact_mode)



    def generate_mobile_android_artifact_mode_mozconfig(self):

        return self.generate_mobile_android_mozconfig(artifact_mode=True)

        super().ensure_mobile_android_packages(artifact_mode=artifact_mode)



    def _update_package_manager(self):

        self.pacman_update()

python/mozboot/mozboot/centosfedora.py

+1 −13
Original line number Diff line number Diff line
@@ -137,19 +137,7 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
        self.dnf_install(*self.mobile_android_packages)



        self.ensure_java(mozconfig_builder)

        from mozboot import android



        android.ensure_android(

            "linux", artifact_mode=artifact_mode, no_interactive=self.no_interactive

        )



    def generate_mobile_android_mozconfig(self, artifact_mode=False):

        from mozboot import android



        return android.generate_mozconfig("linux", artifact_mode=artifact_mode)



    def generate_mobile_android_artifact_mode_mozconfig(self):

        return self.generate_mobile_android_mozconfig(artifact_mode=True)

        super().ensure_mobile_android_packages(artifact_mode=artifact_mode)



    def upgrade_mercurial(self, current):

        if current is None:

python/mozboot/mozboot/debian.py

+1 −13
Original line number Diff line number Diff line
@@ -123,19 +123,7 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper): 


        # 2. Android pieces.

        self.ensure_java(mozconfig_builder)

        from mozboot import android



        android.ensure_android(

            "linux", artifact_mode=artifact_mode, no_interactive=self.no_interactive

        )



    def generate_mobile_android_mozconfig(self, artifact_mode=False):

        from mozboot import android



        return android.generate_mozconfig("linux", artifact_mode=artifact_mode)



    def generate_mobile_android_artifact_mode_mozconfig(self):

        return self.generate_mobile_android_mozconfig(artifact_mode=True)

        super().ensure_mobile_android_packages(artifact_mode=artifact_mode)



    def _update_package_manager(self):

        self.apt_update()

python/mozboot/mozboot/gentoo.py

+1 −13
Original line number Diff line number Diff line
@@ -62,19 +62,7 @@ class GentooBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
        self.run_as_root(["emerge", "--noreplace", "--quiet", "dev-java/openjdk-bin"])



        self.ensure_java(mozconfig_builder)

        from mozboot import android



        android.ensure_android(

            "linux", artifact_mode=artifact_mode, no_interactive=self.no_interactive

        )



    def generate_mobile_android_mozconfig(self, artifact_mode=False):

        from mozboot import android



        return android.generate_mozconfig("linux", artifact_mode=artifact_mode)



    def generate_mobile_android_artifact_mode_mozconfig(self):

        return self.generate_mobile_android_mozconfig(artifact_mode=True)

        super().ensure_mobile_android_packages(artifact_mode=artifact_mode)



    def _update_package_manager(self):

        self.run_as_root(["emerge", "--sync"])

python/mozboot/mozboot/linux_common.py

+21 −0
Original line number Diff line number Diff line
@@ -154,12 +154,33 @@ class DumpSymsInstall(object): 
        )





class MobileAndroidBootstrapper(object):

    def __init__(self, **kwargs):

        pass



    def ensure_mobile_android_packages(self, artifact_mode=False):

        from mozboot import android



        android.ensure_android(

            "linux", artifact_mode=artifact_mode, no_interactive=self.no_interactive

        )



    def generate_mobile_android_mozconfig(self, artifact_mode=False):

        from mozboot import android



        return android.generate_mozconfig("linux", artifact_mode=artifact_mode)



    def generate_mobile_android_artifact_mode_mozconfig(self):

        return self.generate_mobile_android_mozconfig(artifact_mode=True)





class LinuxBootstrapper(

    ClangStaticAnalysisInstall,

    FixStacksInstall,

    DumpSymsInstall,

    LucetcInstall,

    MinidumpStackwalkInstall,

    MobileAndroidBootstrapper,

    NasmInstall,

    NodeInstall,

    SccacheInstall,