From a20f176eb10db5639760d2b85a049faa9fbb4b0b Mon Sep 17 00:00:00 2001 From: David Finol Date: Tue, 23 Nov 2021 20:23:53 -0600 Subject: [PATCH] Dynamically determine JAVA_HOME --- dist/steps/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/steps/build.sh b/dist/steps/build.sh index d299dc44..7ba08d7e 100755 --- a/dist/steps/build.sh +++ b/dist/steps/build.sh @@ -76,8 +76,8 @@ fi if [[ "$BUILD_TARGET" == "Android" && -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then echo "Updating Android SDK with parameters: $ANDROID_SDK_MANAGER_PARAMETERS" - export JAVA_HOME="$UNITY_PATH/Editor/Data/PlaybackEngines/AndroidPlayer/OpenJDK" - /opt/unity/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/tools/bin/sdkmanager "$ANDROID_SDK_MANAGER_PARAMETERS" + export JAVA_HOME="$(awk -F'=' '/JAVA_HOME=/{print $2}' /root/.bashrc)" + "$(awk -F'=' '/ANDROID_HOME=/{print $2}' /root/.bashrc)/tools/bin/sdkmanager" "$ANDROID_SDK_MANAGER_PARAMETERS" echo "Updated Android SDK." else echo "Not updating Android SDK."