Update Dockerfile

Dockerfile

@@ -2,14 +2,15 @@ FROM openjdk:11
 
 RUN apt-get --quiet update --yes && apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 && \
   export ANDROID_COMPILE_SDK="31" && export ANDROID_BUILD_TOOLS="31.0.0" && export ANDROID_SDK_TOOLS="8092744" && \
-  export ANDROID_SDK_ROOT="${PWD}/android-home" && install -d $ANDROID_SDK_ROOT && \
+  export ANDROID_SDK_ROOT="$PWD/android-home" && install -d $ANDROID_SDK_ROOT && \
   wget --quiet --output-document=$ANDROID_SDK_ROOT/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip && \
-  cd $ANDROID_SDK_ROOT && unzip -d cmdline-tools cmdline-tools.zip && cd cmdline-tools && mv cmdline-tools tools || true && \
+  cd $ANDROID_SDK_ROOT && unzip -d cmdline-tools cmdline-tools.zip && cd cmdline-tools && mv cmdline-tools tools || true && cd ../.. && \
   export PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/ && \
   sdkmanager --version && \
   yes | sdkmanager --licenses || true && \
   sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" && \
   sdkmanager "platform-tools" && \
   sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" && \
-  mv $PWD/android-home/build-tools/${ANDROID_BUILD_TOOLS}/d8 $PWD/android-home/build-tools/${ANDROID_BUILD_TOOLS}/dx || true && \
-  mv $PWD/android-home/build-tools/${ANDROID_BUILD_TOOLS}/lib/d8.jar $PWD/android-home/build-tools/${ANDROID_BUILD_TOOLS}/lib/dx.jar || true
+  mv $ANDROID_SDK_ROOT/build-tools/${ANDROID_BUILD_TOOLS}/d8 $ANDROID_SDK_ROOT/build-tools/${ANDROID_BUILD_TOOLS}/dx && \
+  mv $ANDROID_SDK_ROOT/build-tools/${ANDROID_BUILD_TOOLS}/lib/d8.jar $ANDROID_SDK_ROOT/build-tools/${ANDROID_BUILD_TOOLS}/lib/dx.jar && \
+  rm -rf /var/cache