diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 7 | ||||
| -rw-r--r-- | python/servo/bootstrapper/base.py | 8 | ||||
| -rw-r--r-- | python/servo/bootstrapper/bootstrap.py | 6 | ||||
| -rw-r--r-- | python/servo/bootstrapper/windows_gnu.py | 3 | ||||
| -rw-r--r-- | python/servo/bootstrapper/windows_msvc.py | 3 |
5 files changed, 4 insertions, 23 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 9bc7c60fd4a..49dd40648b1 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -136,17 +136,14 @@ class MachCommands(CommandBase): @CommandArgument('--interactive', "-i", action='store_true', help='Need to answer any (Y/n) interactive prompts.') - @CommandArgument('--android', - action='store_true', - help='Install required packages for Android') @CommandArgument('--force', '-f', action='store_true', help='Force reinstall packages') - def bootstrap(self, android=False, interactive=False, force=False): + def bootstrap(self, interactive=False, force=False): from servo.bootstrapper.bootstrap import Bootstrapper bootstrapper = Bootstrapper(self.context) - bootstrapper.bootstrap(android=android, interactive=interactive, force=force) + bootstrapper.bootstrap(interactive=interactive, force=force) @Command('bootstrap-rust', description='Download the Rust compiler', diff --git a/python/servo/bootstrapper/base.py b/python/servo/bootstrapper/base.py index 40f3d1f5ebc..b988e06c53a 100644 --- a/python/servo/bootstrapper/base.py +++ b/python/servo/bootstrapper/base.py @@ -29,14 +29,6 @@ class BaseBootstrapper(object): raise NotImplementedError('%s must implement install_system_packages()' % __name__) - def install_mobile_android_packages(self): - ''' - Install packages required to build Servo for Android. - ''' - raise NotImplementedError('Cannot bootstrap Servo for Android: ' - '%s does not yet implement install_mobile_android_packages()' - % __name__) - def which(self, name): """Python implementation of which. diff --git a/python/servo/bootstrapper/bootstrap.py b/python/servo/bootstrapper/bootstrap.py index d07dc12fc3c..4cd1fc7bc5c 100644 --- a/python/servo/bootstrapper/bootstrap.py +++ b/python/servo/bootstrapper/bootstrap.py @@ -30,13 +30,11 @@ class Bootstrapper(object): self.instance = cls(**args) self.instance.context = context - def bootstrap(self, android=False, interactive=False, force=False): + def bootstrap(self, interactive=False, force=False): self.instance.interactive = interactive self.instance.force = force - if android: - self.instance.install_mobile_android_packages() - elif force: + if force: self.instance.install_system_packages() else: self.instance.ensure_system_packages() diff --git a/python/servo/bootstrapper/windows_gnu.py b/python/servo/bootstrapper/windows_gnu.py index 794f1790cd1..4980baa3bb1 100644 --- a/python/servo/bootstrapper/windows_gnu.py +++ b/python/servo/bootstrapper/windows_gnu.py @@ -32,9 +32,6 @@ class WindowsGnuBootstrapper(BaseBootstrapper): self._ensure_package_manager_updated() self.pacman_install(*packages) - def install_mobile_android_packages(self): - sys.exit('We do not support building Android on Windows. Sorry!') - def _update_package_manager(self): self.pacman_update() diff --git a/python/servo/bootstrapper/windows_msvc.py b/python/servo/bootstrapper/windows_msvc.py index 11ff765c99d..8ca11682d79 100644 --- a/python/servo/bootstrapper/windows_msvc.py +++ b/python/servo/bootstrapper/windows_msvc.py @@ -81,6 +81,3 @@ class WindowsMsvcBootstrapper(BaseBootstrapper): with open(installed_deps_file, 'w') as installed_file: for line in packages: installed_file.write(line + "\n") - - def install_mobile_android_packages(self): - sys.exit('We do not support building Android on Windows. Sorry!') |