Commit 3de8bacb authored by Gurzau Raul's avatar Gurzau Raul
Browse files

Backed out changeset e9bbe52bbd8d (bug 1540788) for breaking bootstrap. a=backout

parent 7d91acd0

python/mozboot/mozboot/base.py

+3 −7
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ class BaseBootstrapper(object): 
            print('Your version of Rust (%s) is new enough.' % version)

            rustup = self.which('rustup', cargo_bin)

            if rustup:

                self.ensure_rust_targets(rustup, version)

                self.ensure_rust_targets(rustup)

            return



        if version:
@@ -697,7 +697,7 @@ class BaseBootstrapper(object): 
            print('Will try to install Rust.')

            self.install_rust()



    def ensure_rust_targets(self, rustup, rust_version):

    def ensure_rust_targets(self, rustup):

        """Make sure appropriate cross target libraries are installed."""

        target_list = subprocess.check_output([rustup, 'target', 'list'])

        targets = [line.split()[0] for line in target_list.splitlines()
@@ -712,11 +712,7 @@ class BaseBootstrapper(object): 


        if 'mobile_android' in self.application:

            # Let's add the most common targets.

            if LooseVersion(rust_version) < '1.33':

                arm_target = 'armv7-linux-androideabi'

            else:

                arm_target = 'thumbv7neon-linux-androideabi'

            android_targets = (arm_target,

            android_targets = ('thumbv7neon-linux-androideabi',

                               'aarch64-linux-android',

                               'i686-linux-android',

                               'x86_64-linux-android', )