summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-12-18 03:46:45 +0100
committercyBerta <cyberta@riseup.net>2021-12-18 03:46:45 +0100
commita6c0134d63e0c841a0bd9295b4cf093bbb7364b7 (patch)
treee84d23b2b0d6f71ad276540219f7005eb418ddfc
parent684963a35cf0ba6e68f52877c1411690f0ef5731 (diff)
use ndk side-by-side, parse ndk directory name from source.properties and adapt the ndk path
-rw-r--r--docker/android-ndk/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 7d38973c..82d9155b 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -32,9 +32,11 @@ ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION}
ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
RUN curl -L $ANDROID_NDK_URL -o ndk.zip \
- && unzip ndk.zip -d $ANDROID_HOME \
+ && unzip ndk.zip -d $ANDROID_HOME/ndk \
&& rm -rf ndk.zip
-
+RUN cat $ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}/source.properties | \
+ grep Pkg.Revision | cut -d "=" -f 2 | \
+ xargs -I '{}' mv $ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}/ $ANDROID_HOME/ndk/'{}'
ENV PATH ${PATH}:${ANDROID_NDK_HOME}
RUN echo "accept all licenses"