Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1408643 - Fix up Proguard install command from configure. r=nalexander

Browse Source 
MozReview-Commit-ID: nvUvoUzFLy

--HG--
extra : rebase_source : 7df5e8828e044037ba49255f04dfe38ed1cc0ca2
This commit is contained in:
J. Ryan Stinnett 2018-02-02 09:43:18 -05:00
parent 5bed033262
commit f69b532a8e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/moz.configure/java.configure
View File

@ -95,8 +95,9 @@ option(env='PROGUARD_JAR', nargs=1, default=proguard_jar_default,
def valid_proguard(java, proguard_jar):
if not proguard_jar or not path.isfile(proguard_jar[0]):
die('proguard.jar 5.3.3 or higher is required (looked for {}). '
'Run |mach artifact install --from-build proguard-jar| or add '
'`export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.'
'Run |mach artifact toolchain --from-build proguard-jar && mv '
'proguard ~/.mozbuild/| or add `export PROGUARD_JAR=/path/to/'
'proguard.jar` to your mozconfig.'
.format(proguard_jar[0]))
try:

2
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
View File

@ -676,7 +676,7 @@ class TestChecksConfigure(unittest.TestCase):
checking for javac... %s
checking for javac version... 1.8
checking for proguard.jar version...
ERROR: proguard.jar 5.3.3 or higher is required (looked for %s). Run |mach artifact install --from-build proguard-jar| or add `export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.
ERROR: proguard.jar 5.3.3 or higher is required (looked for %s). Run |mach artifact toolchain --from-build proguard-jar && mv proguard ~/.mozbuild/| or add `export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.
''' % (java, javah, jar, jarsigner, keytool, javac, old_proguard_jar)))
self.assertEqual(status, 1)
self.assertEqual(config, {