diff options
| author | cyberta <cyberta@riseup.net> | 2022-01-31 10:07:12 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-01-31 10:07:12 +0000 |
| commit | d5b1f44804083db32493ac6b7db3c71131f91ce3 (patch) | |
| tree | 21db44e51189e876661c68ded26691bcb3228137 | |
| parent | f316bbdfed366a5e9e8139e18c704bc3bd62790c (diff) | |
| parent | 1f0d1d885327c87c96aaa9cfd60a464d2c304be8 (diff) | |
Merge branch 'ndk_docker' into 'master'
docker ndk img
See merge request leap/bitmask_android!165
| -rw-r--r-- | docker/android-ndk/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 83c81329..8fe535f5 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update -qq && \ # JNI build dependencies w/ 32-bit compatible C libs RUN apt-get update -qq && \ - apt-get -y install docker-ce docker-ce-cli make gcc file lib32stdc++6 lib32z1 \ + apt-get -y install docker-ce docker-ce-cli make gcc swig file lib32stdc++6 lib32z1 \ autoconf autogen automake autopoint autotools-dev gettext-base libtool patch pkg-config && \ apt-get clean && \ apt-get autoclean && \ @@ -50,3 +50,5 @@ RUN echo "accept all licenses" RUN echo y | sdkmanager --licenses RUN sdkmanager --list +# Install Android cmake +RUN sdkmanager "cmake;3.10.2.4988404" |