diff options
| author | cyberta <cyberta@riseup.net> | 2023-10-31 21:07:01 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2023-10-31 21:07:01 +0000 |
| commit | 45b436424cd897a3d53c146161fbf171838c6b68 (patch) | |
| tree | 24b53662097661d89415f1fcaf6d9aca08dabec6 | |
| parent | e62532bb0b2f57293edf18ae82afab5f3c8621e7 (diff) | |
| parent | 22189050755b96c71464f58c1d1efe32aaf55162 (diff) | |
Merge branch 'update_ndk_docker' into 'master'
force rebuild of docker-ndk image.
See merge request leap/bitmask_android!261
| -rw-r--r-- | docker/android-ndk/Dockerfile | 3 | ||||
| m--------- | tor-android | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index ffe189b3..485160d4 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -37,6 +37,9 @@ 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 ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools +RUN echo $JAVA_HOME +RUN java --version + RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ && unzip ndk.zip -d $ANDROID_HOME/ndk \ && rm -rf ndk.zip diff --git a/tor-android b/tor-android -Subproject 5d7bc0b0bf97dd1f682b54ecaaecb3eb19d29ad +Subproject 853b255b0edc4ede4e56f296096885e05d8998c |