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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-07-02 17:25:38 +00:00
Родитель 5762785f58
Коммит 0c7ee5ce30
2 изменённых файлов: 2 добавлений и 9 удалений

Просмотреть файл

@ -292,15 +292,10 @@ def ensure_android_packages(sdkmanager_tool, packages=None, no_interactive=False
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('')

Просмотреть файл

@ -380,9 +380,7 @@ class OSXBootstrapper(BaseBootstrapper):
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')