Skip to content

Commit 51c4a0b

Browse files
committed
Preserve system binaries in build-android-port PATH
1 parent aa02255 commit 51c4a0b

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

scripts/build-android-port.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,22 @@ fi
108108

109109
log "Loaded environment: JAVA_HOME=${JAVA_HOME:-<unset>} JAVA17_HOME=${JAVA17_HOME:-<unset>} MAVEN_HOME=${MAVEN_HOME:-<unset>}"
110110

111-
export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"
111+
# setup-workspace.sh already prepends the Java and Maven bin directories to PATH
112+
# when generating env.sh. Ensure common system locations remain reachable even
113+
# if the inherited PATH was truncated before sourcing the environment file.
114+
case ":$PATH:" in
115+
*:/usr/bin:*) ;;
116+
*) PATH="$PATH:/usr/bin" ;;
117+
esac
118+
case ":$PATH:" in
119+
*:/bin:*) ;;
120+
*) PATH="$PATH:/bin" ;;
121+
esac
122+
case ":$PATH:" in
123+
*:/usr/local/bin:*) ;;
124+
*) PATH="$PATH:/usr/local/bin" ;;
125+
esac
126+
export PATH
112127
"$JAVA_HOME/bin/java" -version
113128
"$JAVA17_HOME/bin/java" -version
114129
"$MAVEN_HOME/bin/mvn" -version

0 commit comments

Comments
 (0)