Merge remote-tracking branch 'origin/dev' into 3.7

Author: freakboy3742

.dockerignore

@@ -1,4 +1,5 @@
 build
 dist
 .git
-.github
+.github
+tmp

3.7.Dockerfile

@@ -198,10 +198,12 @@ RUN cd rubicon-java-${RUBICON_JAVA_VERSION} && \
 RUN mv rubicon-java-${RUBICON_JAVA_VERSION}/build/librubicon.so $JNI_LIBS
 RUN mkdir -p /opt/python-build/app/libs/ && mv rubicon-java-${RUBICON_JAVA_VERSION}/build/rubicon.jar $APPROOT/app/libs/
 
-# Create output artifacts.
+# Create rubicon.zip and pythonhome.zip for this CPU architecture, filtering
+# pythonhome.zip using pythonhome-excludes to remove the CPython test suite, etc.
 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 .
+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 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.excludes

@@ -0,0 +1,21 @@
+# You can add patterns to this file to remove them
+# from the Python-Android-support.zip file. Note that
+# if you are removing files from the Python standard library,
+# you need to use the 3.7.pythonhome-excludes file.
+#
+# Examples:
+#
+# libs/*/libssl*
+# libs/*/libcrypto*
+#
+# These lines would remove OpenSSL. The libs/ directory contains
+# JNI libraries for the Android app. The first asterisk is needed
+# to match the pattern in all Android ABIs. The second asterisk
+# is present for convenience, to avoid having to specify the full
+# OpenSSL library name.
+#
+# libs/*/*xz*
+#
+# This line would remove the "xz" compression library. This might
+# be appropriate if you don't use that compression format in your
+# code.

3.7.pythonhome-excludes

@@ -0,0 +1,51 @@
+# This is a list of Python standard library path patterns
+# we exclude from the Python-Android-support ZIP file. It is 
+# used by `zip -i@this_file` in `Dockerfile` to filter the pythonhome.zip
+# we generate for each Android ABI.
+#
+# Remove standard library test suites.
+lib/python*/ctypes/test/*
+lib/python*/distutils/tests/*
+lib/python*/lib2to3/tests/*
+lib/python*/sqlite3/test/*
+lib/python*/test/*
+# Remove compiled test and example modules.
+lib/python*/lib-dynload/_test*.so
+lib/python*/lib-dynload/_ctypes_test*.so
+lib/python*/lib-dynload/xxlimited*.so
+lib/python*/lib-dynload/_xxtestfuzz.so
+# Remove wsgiref web app module; it's unusual that mobile apps would
+# start a web app server with it.
+lib/python*/wsgiref/*
+# Remove command-line curses toolkit.
+lib/python*/curses/*
+# Remove config-* directory, which is used for compiling C extension modules.
+lib/python*/config-*
+# Remove ensurepip. If user code needs pip, it can add it to 
+lib/python*/ensurepip/*
+# Remove Tcl/Tk GUI code. We don't build against Tcl/Tk at the moment, so this
+# will not work.
+lib/python*/idlelib/*
+lib/python*/tkinter/*
+lib/python*/turtle.py
+lib/python*/turtledemo/*
+# Remove lib/pkgconfig files. These are used for compiling C extension modules.
+lib/pkgconfig/*
+# Remove site-packages directory. The Android template unpacks user code and
+# dependencies to a different path.
+lib/python*/site-packages/*
+# Remove include/ directory, only useful for compiling C extension modules.
+include/*
+# Remove bin/ directory, which contains executables like 2to3
+# (not useful in the app) and python3, which could possibly be useful,
+# except Python-Android-support doesn't support launching Python as a
+# subprocess very well at the moment.
+bin/*
+# Remove share/ directory, which contains user documentation (man pages).
+share/*
+# Remove libpython.so from the stdlib package. We rely on the libpython.so
+# in the JNI libs directory instead.
+lib/libpython3*.so
+# Remove pyc files. These take up space, but since most stdlib modules are
+# never imported by user code, they mostly have no value.
+*/*.pyc

3.7.sh

@@ -190,7 +190,7 @@ function main() {
     # Make a ZIP file.
     fix_permissions
     pushd build/3.7/app > /dev/null
-    zip -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" .
     popd
 }