aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/bootstrapper
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2017-01-13 16:40:38 -0500
committerAneesh Agrawal <aneeshusa@gmail.com>2017-01-14 00:10:50 -0500
commit5b8d783f4cb622fa68c5270b27ebad1e838ee7cb (patch)
tree8699f358414dd0ab37805122de6b3e3bb1ba283a /python/servo/bootstrapper
parent2fb9a345d6341f57ab4cfdd9a1ae68b2bbd5f9a2 (diff)
downloadservo-5b8d783f4cb622fa68c5270b27ebad1e838ee7cb.tar.gz
servo-5b8d783f4cb622fa68c5270b27ebad1e838ee7cb.zip
Remove unusable --android flag for `mach bootstrap`
`mach` can't do any bootstrapping for Android, so the flag is useless.
Diffstat (limited to 'python/servo/bootstrapper')
-rw-r--r--python/servo/bootstrapper/base.py8
-rw-r--r--python/servo/bootstrapper/bootstrap.py6
-rw-r--r--python/servo/bootstrapper/windows_gnu.py3
-rw-r--r--python/servo/bootstrapper/windows_msvc.py3
4 files changed, 2 insertions, 18 deletions
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!')