sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dockerfile: remove unused parts of sdk and ndk in setup-android-sdk instead

Browse Source 
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:
Henrik Grimler 2022-04-25 22:00:54 +02:00
parent ad4ca4acc4
commit 348c980d53
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/Dockerfile
View File

@ -26,11 +26,7 @@ RUN apt-get update && \
# Removed unused parts to make a smaller Docker image:
apt-get remove -yq --autoremove lsb-release software-properties-common && \
apt-get clean && \
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
rm -rf /var/lib/apt/lists/*
# Switch User
USER builder:builder

6
scripts/setup-android-sdk.sh
View File

@ -24,6 +24,9 @@ if [ ! -d $ANDROID_HOME ]; then
$ANDROID_SDK_SHA256
rm -Rf 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
if [ ! -d $NDK ]; then
@ -36,6 +39,9 @@ if [ ! -d $NDK ]; then
$ANDROID_NDK_SHA256
rm -Rf android-ndk-r$TERMUX_NDK_VERSION
unzip -q ndk-r${TERMUX_NDK_VERSION}.zip
# Remove unused parts
rm -Rf android-ndk-r$TERMUX_NDK_VERSION/sources/cxx-stl/system
fi
yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses