Bug 1440428 - Fix: Don't install Proguard JAR in |mach bootstrap|. r=jchen
MozReview-Commit-ID: EOvKSE5z28P
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -254,24 +254,16 @@ class BaseBootstrapper(object):
def ensure_stylo_packages(self, state_dir, checkout_root):
'''
Install any necessary packages needed for Stylo development.
'''
raise NotImplementedError(
'%s does not yet implement ensure_stylo_packages()'
% __name__)
- def ensure_proguard_packages(self, state_dir, checkout_root):
- '''
- Install any necessary packages that provide the Proguard JAR.
-
- Only required to build mobile/android.
- '''
- self.install_toolchain_artifact(state_dir, checkout_root, 'proguard-jar')
-
def install_toolchain_artifact(self, state_dir, checkout_root, toolchain_job):
mach_binary = os.path.join(checkout_root, 'mach')
mach_binary = os.path.abspath(mach_binary)
if not os.path.exists(mach_binary):
raise ValueError("mach not found at %s" % mach_binary)
# If Python can't figure out what its own executable is, there's little
# chance we're going to be able to execute mach on its own, particularly
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -370,19 +370,16 @@ class Bootstrapper(object):
if not have_clone:
print(STYLO_REQUIRES_CLONE)
sys.exit(1)
self.instance.state_dir = state_dir
self.instance.ensure_stylo_packages(state_dir, checkout_root)
- if 'mobile_android' in application:
- self.instance.ensure_proguard_packages(state_dir, checkout_root)
-
print(self.finished % name)
if not (self.instance.which('rustc') and self.instance._parse_version('rustc')
>= MODERN_RUST_VERSION):
print("To build %s, please restart the shell (Start a new terminal window)" % name)
# Like 'suggest_browser_mozconfig' or 'suggest_mobile_android_mozconfig'.
getattr(self.instance, 'suggest_%s_mozconfig' % application)()