Bug 1528314 - Remove --with-java-bin-path mozconfig entry from bootstrap suggestions. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 02 Jul 2019 23:25:03 +0000
changeset 543891 9a10f1cef191599787e6835c582bc9ea70156228
parent 543890 a4e82d6fdd5b746cd551bfadbe9fb446ff6a9e7b
child 543892 2bd4fed10ef748f543ab06736c53a8d9a3699f40
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1528314
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1528314 - Remove --with-java-bin-path mozconfig entry from bootstrap suggestions. r=nalexander Configure should just be able to find the right one. If it doesn't, that should be fixed in configure rather than with suggestions in bootstrap. Differential Revision: https://phabricator.services.mozilla.com/D36562
python/mozboot/mozboot/android.py
python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -287,25 +287,20 @@ def ensure_android_packages(sdkmanager_t
         cmd = args[0]
         e = subprocess.CalledProcessError(retcode, cmd)
         e.output = output
         raise e
 
     print(output)
 
 
-def suggest_mozconfig(os_name, artifact_mode=False, java_bin_path=None):
+def suggest_mozconfig(os_name, artifact_mode=False):
     moz_state_dir, sdk_path, ndk_path = get_paths(os_name)
 
     extra_lines = []
-    if java_bin_path:
-        extra_lines += [
-            '# With the following java:',
-            'ac_add_options --with-java-bin-path="{}"'.format(java_bin_path),
-        ]
     if extra_lines:
         extra_lines.append('')
 
     if artifact_mode:
         template = MOBILE_ANDROID_ARTIFACT_MODE_MOZCONFIG_TEMPLATE
     else:
         template = MOBILE_ANDROID_MOZCONFIG_TEMPLATE
 
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -375,19 +375,17 @@ class OSXBootstrapper(BaseBootstrapper):
         self.ensure_java()
         from mozboot import android
 
         android.ensure_android('macosx', artifact_mode=artifact_mode,
                                no_interactive=self.no_interactive)
 
     def suggest_homebrew_mobile_android_mozconfig(self, artifact_mode=False):
         from mozboot import android
-        # Path to java from the homebrew/cask-versions/adoptopenjdk8 cask.
-        android.suggest_mozconfig('macosx', artifact_mode=artifact_mode,
-                                  java_bin_path=JAVA_PATH)
+        android.suggest_mozconfig('macosx', artifact_mode=artifact_mode)
 
     def _ensure_macports_packages(self, packages):
         self.port = self.which('port')
         assert self.port is not None
 
         installed = set(self.check_output([self.port, 'installed']).split())
 
         missing = [package for package in packages if package not in installed]