kivy · inclement · Dec 22, 2019 · Aug 15, 2019 · Aug 15, 2019 · Aug 16, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,6 @@ before_install:
   - git remote set-branches --add origin develop
   - git fetch
 
-env:
-  global:
-    - ANDROID_SDK_HOME=/opt/android/android-sdk
-    - ANDROID_NDK_HOME=/opt/android/android-ndk
-
 jobs:
   include:
     - &linting
@@ -65,19 +60,41 @@ jobs:
         # case that the travis log doesn't produce any output for more than 10 minutes
         - while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
       script:
-        - docker run -e CI -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e TRAVIS_BRANCH="$TRAVIS_BRANCH" p4a /bin/sh -c "$COMMAND"
+        - >
+          docker run
+          -e CI
+          -e TRAVIS_JOB_ID
+          -e TRAVIS_BRANCH
+          -e ANDROID_SDK_HOME="/home/user/.android/android-sdk"
+          -e ANDROID_NDK_HOME="/home/user/.android/android-ndk"
+          p4a /bin/sh -c "$COMMAND"
       after_script:
         # kill the background process started before run docker
         - kill %1
-      name: Python 3 armeabi-v7a
+      name: Python 3 arm64-v8a
       # overrides requirements to skip `peewee` pure python module, see:
       # https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
-      env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools' --arch=armeabi-v7a
+      env:
+        COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools --arch=arm64-v8a'
     - <<: *testing
-      name: Python 3 arm64-v8a
-      env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools' --arch=arm64-v8a
+      name: Python 3 armeabi-v7a
+      os: osx
+      osx_image: xcode11  # since xcode1.3, python3 is the default interpreter
+      before_script:
+        # installs java 1.8, android's SDK/NDK and p4a
+        - make -f ci/makefiles/osx.mk
+        - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
+        # Run a background process (like we do with linux tests)
+        - while sleep 540; do echo "==== Still running (travis, don't kill me) ===="; done &
+      script:
+        - >
+          cd testapps && python3 setup_testapp_python3_sqlite_openssl.py apk
+          --sdk-dir $HOME/.android/android-sdk
+          --ndk-dir $HOME/.android/android-ndk
+          --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools
+          --arch=armeabi-v7a
     - <<: *testing
-      name: Python 2 basic
+      name: Python 2 armeabi-v7a (with numpy)
       env: COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools,numpy'
     - <<: *testing
       name: Rebuild updated recipes

diff --git a/Dockerfile.py2 b/Dockerfile.py2
@@ -37,64 +37,17 @@ ENV RETRY="retry -t 3 --"
 RUN curl https://raw.githubusercontent.com/kadwanev/retry/1.0.1/retry \
     --output /usr/local/bin/retry && chmod +x /usr/local/bin/retry
 
-ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
-ENV ANDROID_NDK_VERSION="17c"
-ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
-
-# get the latest version from https://developer.android.com/ndk/downloads/index.html
-ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip"
-ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
-
-# download and install Android NDK
-RUN ${RETRY} curl --location --progress-bar --insecure \
-        "${ANDROID_NDK_DL_URL}" \
-        --output "${ANDROID_NDK_ARCHIVE}" \
-    && mkdir --parents "${ANDROID_NDK_HOME_V}" \
-    && unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
-    && ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
-    && rm -rf "${ANDROID_NDK_ARCHIVE}"
-
-
-ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
-
-# get the latest version from https://developer.android.com/studio/index.html
-ENV ANDROID_SDK_TOOLS_VERSION="4333796"
-ENV ANDROID_SDK_BUILD_TOOLS_VERSION="28.0.2"
-ENV ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
-ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
-
-# download and install Android SDK
-RUN ${RETRY} curl --location --progress-bar --insecure \
-        "${ANDROID_SDK_TOOLS_DL_URL}" \
-        --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
-    && mkdir --parents "${ANDROID_SDK_HOME}" \
-    && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
-    && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
-
-# update Android SDK, install Android API, Build Tools...
-RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
-    && echo '### User Sources for Android SDK Manager' \
-        > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
-
-# Download and accept Android licenses (JDK necessary!)
-RUN ${RETRY} apt -y install -qq --no-install-recommends openjdk-8-jdk \
-    && apt -y autoremove
-RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null
-RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-27" > /dev/null
-
-# Set avdmanager permissions (executable)
-RUN chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
-
-
 ENV USER="user"
 ENV HOME_DIR="/home/${USER}"
+ENV ANDROID_HOME="${HOME_DIR}/.android"
 ENV WORK_DIR="${HOME_DIR}" \
     PATH="${HOME_DIR}/.local/bin:${PATH}"
 
 # install system dependencies
 RUN ${RETRY} apt -y install -qq --no-install-recommends \
         python virtualenv python-pip wget lbzip2 patch sudo \
-    && apt -y autoremove
+    && apt -y autoremove \
+    && apt -y clean
 
 # build dependencies
 # https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
@@ -113,6 +66,10 @@ RUN ${RETRY} apt -y install -qq --no-install-recommends \
     && apt -y autoremove \
     && apt -y clean
 
+# Install Java, set JAVA_HOME (to accept android's SDK licenses) and clean
+RUN ${RETRY} apt -y install -qq --no-install-recommends openjdk-8-jdk \
+    && apt -y autoremove && apt -y clean
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
 # prepare non root env
 RUN useradd --create-home --shell /bin/bash ${USER}
@@ -124,9 +81,12 @@ RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR ${WORK_DIR}
 COPY --chown=user:user . ${WORK_DIR}
-RUN chown --recursive ${USER} ${ANDROID_SDK_HOME}
+RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${ANDROID_HOME}
 USER ${USER}
 
+# Download and install android's NDK/SDK
+RUN make -f ci/makefiles/android.mk target_os=linux
+
 # install python-for-android from current branch
 RUN virtualenv --python=python venv \
     && . venv/bin/activate \

diff --git a/Dockerfile.py3 b/Dockerfile.py3
@@ -17,8 +17,6 @@
 
 FROM ubuntu:18.04
 
-ENV ANDROID_HOME="/opt/android"
-
 # configure locale
 RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
     locales && \
@@ -37,57 +35,9 @@ ENV RETRY="retry -t 3 --"
 RUN curl https://raw.githubusercontent.com/kadwanev/retry/1.0.1/retry \
     --output /usr/local/bin/retry && chmod +x /usr/local/bin/retry
 
-ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
-ENV ANDROID_NDK_VERSION="17c"
-ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
-
-# get the latest version from https://developer.android.com/ndk/downloads/index.html
-ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip"
-ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
-
-# download and install Android NDK
-RUN ${RETRY} curl --location --progress-bar --insecure \
-        "${ANDROID_NDK_DL_URL}" \
-        --output "${ANDROID_NDK_ARCHIVE}" \
-    && mkdir --parents "${ANDROID_NDK_HOME_V}" \
-    && unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
-    && ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
-    && rm -rf "${ANDROID_NDK_ARCHIVE}"
-
-
-ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
-
-# get the latest version from https://developer.android.com/studio/index.html
-ENV ANDROID_SDK_TOOLS_VERSION="4333796"
-ENV ANDROID_SDK_BUILD_TOOLS_VERSION="28.0.2"
-ENV ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
-ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
-
-# download and install Android SDK
-RUN ${RETRY} curl --location --progress-bar --insecure \
-        "${ANDROID_SDK_TOOLS_DL_URL}" \
-        --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
-    && mkdir --parents "${ANDROID_SDK_HOME}" \
-    && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
-    && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
-
-# update Android SDK, install Android API, Build Tools...
-RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
-    && echo '### User Sources for Android SDK Manager' \
-        > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
-
-# Download and accept Android licenses (JDK necessary!)
-RUN ${RETRY} apt -y install -qq --no-install-recommends openjdk-8-jdk \
-    && apt -y autoremove
-RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null
-RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-27" > /dev/null
-
-# Set avdmanager permissions (executable)
-RUN chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
-
-
 ENV USER="user"
 ENV HOME_DIR="/home/${USER}"
+ENV ANDROID_HOME="${HOME_DIR}/.android"
 ENV WORK_DIR="${HOME_DIR}" \
     PATH="${HOME_DIR}/.local/bin:${PATH}"
 
@@ -114,6 +64,10 @@ RUN ${RETRY} apt -y install -qq --no-install-recommends \
     && apt -y autoremove \
     && apt -y clean
 
+# Install Java and set JAVA_HOME (to accept android's SDK licenses)
+RUN ${RETRY} apt -y install -qq --no-install-recommends openjdk-8-jdk \
+    && apt -y autoremove && apt -y clean
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
 # prepare non root env
 RUN useradd --create-home --shell /bin/bash ${USER}
@@ -127,9 +81,12 @@ RUN pip2 install --upgrade Cython==0.28.6
 
 WORKDIR ${WORK_DIR}
 COPY --chown=user:user . ${WORK_DIR}
-RUN chown --recursive ${USER} ${ANDROID_SDK_HOME}
+RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${ANDROID_HOME}
 USER ${USER}
 
+# Download and install android's NDK/SDK
+RUN make -f ci/makefiles/android.mk target_os=linux
+
 # install python-for-android from current branch
 RUN virtualenv --python=python3 venv \
     && . venv/bin/activate \

diff --git a/README.md b/README.md
@@ -92,29 +92,33 @@ Please refer to the LICENSE file.
 
 ## History
 
-In 2015 these tools were rewritten to provide a new, easier to use and
-extend interface. If you'd like to browse the old toolchain, its
+In 2015 these tools were rewritten to provide a new, easier-to-use and
+easier-to-extend interface. If you'd like to browse the old toolchain, its
 status is recorded for posterity at at
 https://github.com/kivy/python-for-android/tree/old_toolchain.
 
-In the last quarter of 2018 the python recipes has been changed, the
-new recipe for python3 (3.7.1) has a new build system which has been
+In the last quarter of 2018 the python recipes were changed. The
+new recipe for python3 (3.7.1) had a new build system which was
 applied to the ancient python recipe, allowing us to bump the python2
-version number to 2.7.15. This change, unifies the build process for
-both python recipes, and probably solve some issues detected over the
-years. Also should be mentioned that this **unified python recipes**
-require to target to a **minimum api level of 21**,
-*Android 5.0 - Lollipop*, so in case the you need to build targeting an
-api level below 21, you must use an old version of python-for-android
-(<=0.7.1). All this work has been done using android ndk version r17c,
-and your build should success with that version...but be aware that the
-project is in constant development so...the ndk version will change at
-some time.
+version number to 2.7.15. This change unified the build process for
+both python recipes, and probably solved various issues detected over the
+years. It should also be mentioned that these **unified python recipes**
+require a **minimum target api level of 21**,
+*Android 5.0 - Lollipop*, so in the case that you need to build targeting an
+api level below 21, you should use an older version of python-for-android
+(<=0.7.1).
+
+Be aware that this project is in constant development so, as per time of writing,
+you should use a minimum on Android's NDK r19, and ``we recommend using NDK r19b``.
+This is because the toolchains installed by
+default with the NDK can be used *in-place* and the python-for-android project
+has been adapted for that feature. Also be aware that more recent versions of the
+Android's NDK may not work.
 
 Those mentioned changes has been done this way to make easier the transition
 between python3 and python2. We will slowly phase out python2 support
 towards 2020...so...if you are using python2 in your projects you should
-consider to migrate it into python3.
+consider migrating it into python3.
 
 ## Contributors
 

diff --git a/ci/constants.py b/ci/constants.py
@@ -65,10 +65,8 @@ class TargetPython(Enum):
     # IndexError: list index out of range
     'secp256k1',
     'ffpyplayer',
-    'icu',
     # requires `libpq-dev` system dependency e.g. for `pg_config` binary
     'psycopg2',
-    'protobuf_cpp',
     # most likely some setup in the Docker container, because it works in host
     'pyjnius', 'pyopenal',
     # SyntaxError: invalid syntax (Python2)

diff --git a/ci/makefiles/android.mk b/ci/makefiles/android.mk
@@ -0,0 +1,68 @@
+# Downloads and installs the Android SDK depending on supplied platform: darwin or linux
+
+# We must provide a platform (darwin or linux) and we need JAVA_HOME defined
+ifndef target_os
+    $(error target_os is not set...aborted!)
+endif
+
+# Those android NDK/SDK variables can be override when running the file
+ANDROID_NDK_VERSION ?= 19b
+ANDROID_SDK_TOOLS_VERSION ?= 4333796
+ANDROID_SDK_BUILD_TOOLS_VERSION ?= 28.0.2
+ANDROID_HOME ?= $(HOME)/.android
+ANDROID_API_LEVEL ?= 27
+
+ANDROID_SDK_HOME=$(ANDROID_HOME)/android-sdk
+ANDROID_SDK_TOOLS_ARCHIVE=sdk-tools-$(target_os)-$(ANDROID_SDK_TOOLS_VERSION).zip
+ANDROID_SDK_TOOLS_DL_URL=https://dl.google.com/android/repository/$(ANDROID_SDK_TOOLS_ARCHIVE)
+
+ANDROID_NDK_HOME=$(ANDROID_HOME)/android-ndk
+ANDROID_NDK_FOLDER=$(ANDROID_HOME)/android-ndk-r$(ANDROID_NDK_VERSION)
+ANDROID_NDK_ARCHIVE=android-ndk-r$(ANDROID_NDK_VERSION)-$(target_os)-x86_64.zip
+ANDROID_NDK_DL_URL=https://dl.google.com/android/repository/$(ANDROID_NDK_ARCHIVE)
+
+$(info Target install OS is          : $(target_os))
+$(info Android SDK home is           : $(ANDROID_SDK_HOME))
+$(info Android NDK home is           : $(ANDROID_NDK_HOME))
+$(info Android SDK download url is   : $(ANDROID_SDK_TOOLS_DL_URL))
+$(info Android NDK download url is   : $(ANDROID_NDK_DL_URL))
+$(info Android API level is          : $(ANDROID_API_LEVEL))
+$(info Android NDK version is        : $(ANDROID_NDK_VERSION))
+$(info JAVA_HOME is                  : $(JAVA_HOME))
+
+all: install_sdk install_ndk
+
+install_sdk: download_android_sdk extract_android_sdk update_android_sdk
+
+install_ndk: download_android_ndk extract_android_ndk
+
+download_android_sdk:
+	curl --location --progress-bar --continue-at - \
+	$(ANDROID_SDK_TOOLS_DL_URL) --output $(ANDROID_SDK_TOOLS_ARCHIVE)
+
+download_android_ndk:
+	curl --location --progress-bar --continue-at - \
+	$(ANDROID_NDK_DL_URL) --output $(ANDROID_NDK_ARCHIVE)
+
+# Extract android SDK and remove the compressed file
+extract_android_sdk:
+	mkdir -p $(ANDROID_SDK_HOME) \
+	&& unzip -q $(ANDROID_SDK_TOOLS_ARCHIVE) -d $(ANDROID_SDK_HOME) \
+	&& rm -f $(ANDROID_SDK_TOOLS_ARCHIVE)
+
+
+# Extract android NDK and remove the compressed file
+extract_android_ndk:
+	mkdir -p $(ANDROID_NDK_FOLDER) \
+	&& unzip -q $(ANDROID_NDK_ARCHIVE) -d $(ANDROID_HOME) \
+	&& ln -sfn $(ANDROID_NDK_FOLDER) $(ANDROID_NDK_HOME) \
+	&& rm -f $(ANDROID_NDK_ARCHIVE)
+
+# updates Android SDK, install Android API, Build Tools and accept licenses
+update_android_sdk:
+	touch $(ANDROID_HOME)/repositories.cfg
+	yes | $(ANDROID_SDK_HOME)/tools/bin/sdkmanager --licenses > /dev/null
+	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager "build-tools;$(ANDROID_SDK_BUILD_TOOLS_VERSION)" > /dev/null
+	$(ANDROID_SDK_HOME)/tools/bin/sdkmanager "platforms;android-$(ANDROID_API_LEVEL)" > /dev/null
+	# Set avdmanager permissions (executable)
+	chmod +x $(ANDROID_SDK_HOME)/tools/bin/avdmanager
diff --git a/ci/makefiles/osx.mk b/ci/makefiles/osx.mk
@@ -0,0 +1,23 @@
+# installs java 1.8, android's SDK/NDK, cython and p4a
+
+# The following variable/s can be override when running the file
+ANDROID_HOME ?= $(HOME)/.android
+
+all: install_java upgrade_cython install_android_ndk_sdk install_p4a
+
+install_java:
+	brew tap adoptopenjdk/openjdk
+	brew cask install adoptopenjdk8
+	/usr/libexec/java_home -V
+
+upgrade_cython:
+	pip3 install --upgrade Cython==0.28.6
+
+install_android_ndk_sdk:
+	mkdir -p $(ANDROID_HOME)
+	make -f ci/makefiles/android.mk target_os=darwin JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+
+install_p4a:
+	# check python version and install p4a
+	python3 --version
+	pip3 install -e .