Merge branch 'dev' into 3.7

Author: freakboy3742

3.7.Dockerfile

@@ -203,7 +203,11 @@ RUN mkdir -p /opt/python-build/app/libs/ && mv rubicon-java-${RUBICON_JAVA_VERSI
 ENV ASSETS_DIR $APPROOT/app/src/main/assets/
 ARG COMPRESS_LEVEL
 ADD 3.7.pythonhome-excludes /opt/python-build/
-RUN mkdir -p "$ASSETS_DIR" && cd "$PYTHON_INSTALL_DIR" && zip -x@/opt/python-build/3.7.pythonhome-excludes -$COMPRESS_LEVEL -q "$ASSETS_DIR"/pythonhome.${TARGET_ABI_SHORTNAME}.zip -r .
+RUN mkdir -p "$ASSETS_DIR/stdlib" && cd "$PYTHON_INSTALL_DIR" && zip -x@/opt/python-build/3.7.pythonhome-excludes -$COMPRESS_LEVEL -q "$ASSETS_DIR"/stdlib/pythonhome.${TARGET_ABI_SHORTNAME}.zip -r .
+# Rename the ZIP file to include its sha256sum. This enables fast, accurate
+# cache validation/invalidation when the ZIP file reaches the Android device.
+RUN sha256sum "$ASSETS_DIR"/stdlib/pythonhome.${TARGET_ABI_SHORTNAME}.zip | cut -d' ' -f1 > /tmp/sum
+RUN mv "$ASSETS_DIR"/stdlib/pythonhome.${TARGET_ABI_SHORTNAME}.zip "$ASSETS_DIR"/stdlib/pythonhome.`cat /tmp/sum`.${TARGET_ABI_SHORTNAME}.zip
 RUN cd rubicon-java-${RUBICON_JAVA_VERSION} && zip -$COMPRESS_LEVEL -q "$ASSETS_DIR"/rubicon.zip -r rubicon
 
 RUN apt-get update -qq && apt-get -qq install rsync

3.7.sh

@@ -187,10 +187,12 @@ function main() {
         build_one_abi "$TARGET_ABI_SHORTNAME" "3.7" "$COMPRESS_LEVEL"
     done
 
-    # Make a ZIP file.
+    # Make a ZIP file, writing it first to `.tmp` so that we atomically clobber an
+    # existing ZIP file rather than attempt to merge the new contents with old.
     fix_permissions
     pushd build/3.7/app > /dev/null
-    zip -x@../../../3.7.excludes -r -"${COMPRESS_LEVEL}" "../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip" .
+    zip -x@../../../3.7.excludes -r -"${COMPRESS_LEVEL}" "../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip".tmp .
+    mv "../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip".tmp "../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip"
     popd
 }