diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | docker/android-ndk/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 7 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae4e2fbf..5354c378 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,6 @@ build: - ./scripts/cleanProject.sh - lsb_release -a - g++ --version - - apt-get install libstdc++-13-dev - ./scripts/build_deps.sh >> build_deps.log 2>&1 - ./gradlew clean assembleNormalProductionFatDebug -debug >> build.log 2>&1 artifacts: diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 439f0d26..0c55f3cc 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 swig file lib32stdc++6 lib32z1 \ + apt-get -y install docker-ce docker-ce-cli make gcc swig file lib32stdc++6 libstdc++-11-dev lib32z1 \ autoconf autogen automake autopoint autotools-dev gettext-base libtool patch pkg-config po4a && \ apt-get clean && \ apt-get autoclean && \ diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index ba089fca..80f444b3 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -54,9 +54,6 @@ ENV ANDROID_HOME=/opt/android-sdk-linux ENV ANDROID_SDK_URL=https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip ENV ANDROID_SDK_ROOT=${ANDROID_HOME} -RUN echo $JAVA_HOME -RUN java --version - # Install SDK Tools RUN curl -L $ANDROID_SDK_URL -o sdk-tools.zip \ && mkdir -p /opt/android-sdk-linux \ @@ -68,8 +65,8 @@ RUN curl -L $ANDROID_SDK_URL -o sdk-tools.zip \ && rm -f sdk-tools.zip # Update PATH -ENV PATH ${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/cmdline-tools:${ANDROID_HOME}/cmd-tools/bin:${ANDROID_HOME}/platform-tools -ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/cmdline-tools/latest +ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/cmdline-tools:${ANDROID_HOME}/cmd-tools/bin:${ANDROID_HOME}/platform-tools:${JAVA_HOME}/bin +ENV ANDROID_SDK_ROOT=${ANDROID_HOME}/cmdline-tools/latest # Debug location and path |