diff options
| author | cyberta <cyberta@riseup.net> | 2026-03-14 12:45:14 +0100 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2026-03-16 11:08:57 +0000 |
| commit | a809af621d350ac7106e60945dc8d5e628d8cb81 (patch) | |
| tree | 053028b70fbd08b51b10a2c8e72c284772ad1b84 /docker/android-sdk/Dockerfile | |
| parent | 67df141dca7f46ce407734cae7d057487b31a89b (diff) | |
add JAVA_HOME/bin to PATH in android-sdk imgae, install libstdc++-11-dev in android-ndk image
Diffstat (limited to 'docker/android-sdk/Dockerfile')
| -rw-r--r-- | docker/android-sdk/Dockerfile | 7 |
1 files changed, 2 insertions, 5 deletions
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 |