Skip to content
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

Jump to bottom

Android: Update env variables and NDK preinstallation to match Godot buildsystem changes #64

Merged
merged 3 commits into from Jan 6, 2021
Merged

Android: Update env variables and NDK preinstallation to match Godot buildsystem changes #64

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5978e67
Update Dockerfile.android
Jan 5, 2021
c079413
Update Dockerfile.android
Jan 6, 2021
d40854f
Update Dockerfile.android
Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions Dockerfile.android
View file
Open in desktop
Expand Up @@ -3,6 +3,10 @@ FROM godot-mono:${img_version}

ARG mono_version

ENV ANDROID_SDK_ROOT=/root/sdk
ENV ANDROID_NDK_VERSION=21.3.6528147
ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
dnf -y install --setopt=install_weak_deps=False \
java-1.8.0-openjdk-devel ncurses-compat-libs && \
Expand All @@ -11,10 +15,7 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
unzip commandlinetools-linux-6609375_latest.zip && \
rm commandlinetools-linux-6609375_latest.zip && \
yes | tools/bin/sdkmanager --licenses && \
tools/bin/sdkmanager 'ndk;21.3.6528147' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404'

ENV ANDROID_SDK_ROOT=/root/sdk/
ENV ANDROID_NDK_ROOT=/root/sdk/ndk/21.3.6528147/
tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" 'ndk;${ANDROID_NDK_VERSION}' 'cmdline-tools;latest' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404'

RUN cp -a /root/files/${mono_version} /root && \
export MONO_SOURCE_ROOT=/root/${mono_version} && \
Expand Down