summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-12-20 20:29:31 +0000
committercyberta <cyberta@riseup.net>2021-12-20 20:29:31 +0000
commitf459db047966a21d80b4e039429419c5091c1eeb (patch)
treec8c5b0e386fb7d69319759abc1342ecd47dcd0a8 /docker
parent2d05fa3dd46f11536a1af2b9dae23c51d3510c98 (diff)
parenta6c0134d63e0c841a0bd9295b4cf093bbb7364b7 (diff)
Merge branch 'fix_ndk_path' into 'master'
fix docker ndk image See merge request leap/bitmask_android!159
Diffstat (limited to 'docker')
-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"