Merge pull request KhronosGroup#35 from MarijnS95/android-drop-patcher

android-sdk: No longer install removed `patcher;v4`

Author: rpavlik

build-all.sh

@@ -13,5 +13,5 @@ set -e
     ./build-one.sh openxr 20231010.1 "$@"
     ./build-one.sh openxr-sdk 20230614 "$@"
     ./build-one.sh openxr-pregenerated-sdk 20230822 "$@"
-    ./build-one.sh openxr-android 20230713 "$@"
+    ./build-one.sh openxr-android 20231206 "$@"
 )

build-one.sh

@@ -27,10 +27,18 @@ REPO="khronosgroup/docker-images"
     docker build "$@" . -f "$DOCKERFILE.Dockerfile" \
         --build-arg "VERSION=$VERSION" \
         -t "$REPO:$DOCKERFILE" \
-        -t "$REPO:$DOCKERFILE.$VERSION"
+        -t "$REPO:$DOCKERFILE.$VERSION" \
+        $EXTRA_DOCKER_ARGS
     if [ "$OP" == "push" ]; then
         docker push "$REPO:$DOCKERFILE"
         docker push "$REPO:$DOCKERFILE.$VERSION"
     fi
+
+    # Show how to refer to it.
+    HASH=$(docker inspect --format='{{index .RepoDigests 0}}' "$REPO:$DOCKERFILE.$VERSION" | sed -E -n "s/.*(sha256:.*)/\1/p")
+    echo
+    echo "** To refer to this image precisely, use:"
+    echo "   $REPO:$DOCKERFILE.$VERSION@$HASH"
+
     [ -n "$CI" ] && echo "::endgroup::"
 )

install-android-sdk.sh

@@ -41,9 +41,6 @@ echo y | $SDKMANAGER "ndk;${ANDROID_NDK_VERSION}" >> /dev/null
 echo "Installing CMake ${ANDROID_CMAKE_VERSION}"
 echo y | $SDKMANAGER "cmake;${ANDROID_CMAKE_VERSION}" >> /dev/null
 
-echo "Installing the Android 'patcher'"
-echo y | $SDKMANAGER "patcher;v4" >> /dev/null
-
 echo "Installing the Android build tools ${ANDROID_BUILD_TOOLS}"
 echo y | $SDKMANAGER "build-tools;${ANDROID_BUILD_TOOLS}" >> /dev/null