Skip to content

Completely disable Android env for Intel Mac builds #2814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ted-xie wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −0
Open

Completely disable Android env for Intel Mac builds #2814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions buildkite/bazelci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,10 @@ def execute_commands(
# We have to explicitly convert the value to a string, because sometimes YAML tries to
# be smart and converts strings like "true" and "false" to booleans.
os.environ[key] = os.path.expandvars(str(value))
# Disable Android environment for Intel Macs
if is_mac() and platform_module.machine() == "x86_64":
os.environ.pop("ANDROID_HOME", None)
os.environ.pop("ANDROID_NDK_HOME", None)

# Avoid "Network is unreachable" errors in IPv6-only environments
for e in ("COURSIER_OPTS", "JAVA_TOOL_OPTIONS", "SSL_CERT_FILE"):
Expand Down