Merge pull request #6 from paulproteus/add-compression

Add compression to support library

Author: freakboy3742

3.7.Dockerfile

@@ -189,8 +189,6 @@ RUN cd Python-3.7.6 && rm Lib/test/test_wsgiref.py
 # Install Python.
 RUN cd Python-3.7.6 && make install
 RUN cp -a $PYTHON_INSTALL_DIR/lib/libpython3.7m.so "$JNI_LIBS"
-ENV ASSETS_DIR $APPROOT/app/src/main/assets/
-RUN mkdir -p "$ASSETS_DIR" && cd "$PYTHON_INSTALL_DIR" && zip -0 -q "$ASSETS_DIR"/pythonhome.${TARGET_ABI_SHORTNAME}.zip -r .
 
 # Download & install rubicon-java.
 ARG RUBICON_JAVA_VERSION=0.2020-02-27.0
@@ -199,6 +197,11 @@ RUN cd rubicon-java-${RUBICON_JAVA_VERSION} && \
     LDFLAGS='-landroid -llog' PYTHON_CONFIG=$PYTHON_INSTALL_DIR/bin/python3-config make
 RUN mv rubicon-java-${RUBICON_JAVA_VERSION}/dist/librubicon.so $JNI_LIBS
 RUN mkdir -p /opt/python-build/app/libs/ && mv rubicon-java-${RUBICON_JAVA_VERSION}/dist/rubicon.jar $APPROOT/app/libs/
-RUN cd rubicon-java-${RUBICON_JAVA_VERSION} && zip -0 -q "$ASSETS_DIR"/rubicon.zip -r rubicon
+
+# Create output artifacts.
+ENV ASSETS_DIR $APPROOT/app/src/main/assets/
+ARG COMPRESS_LEVEL
+RUN mkdir -p "$ASSETS_DIR" && cd "$PYTHON_INSTALL_DIR" && zip -$COMPRESS_LEVEL -q "$ASSETS_DIR"/pythonhome.${TARGET_ABI_SHORTNAME}.zip -r .
+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

@@ -38,6 +38,7 @@ function extract_image_name() {
 function build_one_abi() {
     TARGET_ABI_SHORTNAME="$1"
     PYTHON_VERSION="$2"
+    COMPRESS_LEVEL="$3"
     # Using ANDROID_API_LEVEL=21 for two reasons:
     #
     # - >= 21 gives us a `localeconv` libc function (admittedly a
@@ -85,7 +86,7 @@ function build_one_abi() {
         ;;
     esac
 
-    docker build --build-arg COMPILER_TRIPLE="${COMPILER_TRIPLE}" --build-arg OPENSSL_BUILD_TARGET="$OPENSSL_BUILD_TARGET" --build-arg TARGET_ABI_SHORTNAME="$TARGET_ABI_SHORTNAME" --build-arg TOOLCHAIN_TRIPLE="$TOOLCHAIN_TRIPLE" --build-arg ANDROID_API_LEVEL="$ANDROID_API_LEVEL" -f "${PYTHON_VERSION}".Dockerfile . | extract_image_name
+    docker build --build-arg COMPRESS_LEVEL="${COMPRESS_LEVEL}" --build-arg COMPILER_TRIPLE="${COMPILER_TRIPLE}" --build-arg OPENSSL_BUILD_TARGET="$OPENSSL_BUILD_TARGET" --build-arg TARGET_ABI_SHORTNAME="$TARGET_ABI_SHORTNAME" --build-arg TOOLCHAIN_TRIPLE="$TOOLCHAIN_TRIPLE" --build-arg ANDROID_API_LEVEL="$ANDROID_API_LEVEL" -f "${PYTHON_VERSION}".Dockerfile . | extract_image_name
     local IMAGE_NAME
     IMAGE_NAME="$(cat $IMAGE_NAME_TEMPFILE)"
     if [ -z "$IMAGE_NAME" ]; then
@@ -177,15 +178,20 @@ function main() {
     rm -rf ./build/3.7
     mkdir -p build/3.7
 
+    # Allow COMPRESS_LEVEL to be overridden by environment variable.
+    COMPRESS_LEVEL="${COMPRESS_LEVEL:-8}"
+
     # Allow TARGET_ABIs to be overridden by argv.
     TARGET_ABIS="${@:-x86 x86_64 armeabi-v7a arm64-v8a}"
     for TARGET_ABI_SHORTNAME in $TARGET_ABIS; do
-        build_one_abi "$TARGET_ABI_SHORTNAME" "3.7"
+        build_one_abi "$TARGET_ABI_SHORTNAME" "3.7" "$COMPRESS_LEVEL"
     done
 
     # Make a ZIP file.
     fix_permissions
-    cd build/3.7/app && zip -q -i '*' -r ../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip . && cd ../../..
+    pushd build/3.7/app > /dev/null
+    zip -r -"${COMPRESS_LEVEL}" "../../../dist/Python-3.7-Android-support${BUILD_TAG}.zip" .
+    popd
 }
 
 download_urls