Dockerfile: remove unused parts of sdk and ndk in setup-android-sdk instead
Dockerfile setup script doesn't know exactly which ndk/sdk version we are using, so can't cd to the right folder now that the version is part of the folder name.
This commit is contained in:
parent
ad4ca4acc4
commit
348c980d53
|
@ -26,11 +26,7 @@ RUN apt-get update && \
|
||||||
# Removed unused parts to make a smaller Docker image:
|
# Removed unused parts to make a smaller Docker image:
|
||||||
apt-get remove -yq --autoremove lsb-release software-properties-common && \
|
apt-get remove -yq --autoremove lsb-release software-properties-common && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
cd /home/builder/lib/android-ndk/ && \
|
|
||||||
rm -Rf sources/cxx-stl/system && \
|
|
||||||
cd /home/builder/lib/android-sdk/tools && \
|
|
||||||
rm -Rf emulator* lib* proguard templates
|
|
||||||
|
|
||||||
# Switch User
|
# Switch User
|
||||||
USER builder:builder
|
USER builder:builder
|
||||||
|
|
|
@ -24,6 +24,9 @@ if [ ! -d $ANDROID_HOME ]; then
|
||||||
$ANDROID_SDK_SHA256
|
$ANDROID_SDK_SHA256
|
||||||
rm -Rf android-sdk-$TERMUX_SDK_REVISION
|
rm -Rf android-sdk-$TERMUX_SDK_REVISION
|
||||||
unzip -q tools-$TERMUX_SDK_REVISION.zip -d android-sdk-$TERMUX_SDK_REVISION
|
unzip -q tools-$TERMUX_SDK_REVISION.zip -d android-sdk-$TERMUX_SDK_REVISION
|
||||||
|
|
||||||
|
# Remove unused parts
|
||||||
|
rm -Rf android-sdk-$TERMUX_SDK_REVISION/{emulator*,lib*,proguard,templates}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d $NDK ]; then
|
if [ ! -d $NDK ]; then
|
||||||
|
@ -36,6 +39,9 @@ if [ ! -d $NDK ]; then
|
||||||
$ANDROID_NDK_SHA256
|
$ANDROID_NDK_SHA256
|
||||||
rm -Rf android-ndk-r$TERMUX_NDK_VERSION
|
rm -Rf android-ndk-r$TERMUX_NDK_VERSION
|
||||||
unzip -q ndk-r${TERMUX_NDK_VERSION}.zip
|
unzip -q ndk-r${TERMUX_NDK_VERSION}.zip
|
||||||
|
|
||||||
|
# Remove unused parts
|
||||||
|
rm -Rf android-ndk-r$TERMUX_NDK_VERSION/sources/cxx-stl/system
|
||||||
fi
|
fi
|
||||||
|
|
||||||
yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses
|
yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses
|
||||||
|
|
Loading…
Reference in New Issue