cffi==1.14.6

.gitlab-ci.yml

@@ -6,12 +6,12 @@ stages:
 
 build arm64 aar:
   stage: build
-  image: lbry/android-base:python39
+  image: lbry/android-base:python3.10
   before_script:
     - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
   artifacts:
     paths:
-      - bin/lbrysdk-*-release__arm64.aar
+      - bin/lbrysdk-*-arm64-v8a-release.aar
     expire_in: 1 week
   script:
     - export NEXUS_SIGNING_KEYRING_FILE=$CI_PROJECT_DIR/signing.pgp
@@ -22,21 +22,23 @@ build arm64 aar:
     - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
     - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
     - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
+    - cp -f $CI_PROJECT_DIR/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk
+    - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite
+    - cp -Rf $CI_PROJECT_DIR/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite
     - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
     - mv buildozer.spec.arm64.ci buildozer.spec
     - chmod u+x ./build-release.sh
-    - "./build-release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered"
+    - ./build-release.sh
-    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release__arm64.aar
+    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-arm64-v8a-release.aar /dev/null
-    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar /dev/null
 
 build arm aar:
   stage: build2
-  image: lbry/android-base:python39
+  image: lbry/android-base:python3.10
   before_script:
     - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
   artifacts:
     paths:
-      - bin/lbrysdk-*-release__arm.aar
+      - bin/lbrysdk-*-armeabi-v7a-release.aar
     expire_in: 1 week
   script:
     - export NEXUS_SIGNING_KEYRING_FILE=$CI_PROJECT_DIR/signing.pgp
@@ -48,12 +50,14 @@ build arm aar:
     - cp -f $CI_PROJECT_DIR/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm $CI_PROJECT_DIR/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
     - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
     - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
+    - cp -f $CI_PROJECT_DIR/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk
+    - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite
+    - cp -Rf $CI_PROJECT_DIR/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite
     - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
     - mv buildozer.spec.arm.ci buildozer.spec
     - chmod u+x ./build-release.sh
-    - "./build-release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered"
+    - ./build-release.sh
-    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release__arm.aar
+    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-armeabi-v7a-release.aar /dev/null
-    - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar /dev/null
 
 deploy build.lbry.io:
   image: python:latest
@@ -64,8 +68,8 @@ deploy build.lbry.io:
   before_script:
     - pip install awscli
     - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
-    - export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-release__arm.aar
+    - export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-armeabi-v7a-release.aar
-    - export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-release__arm64.aar
+    - export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-arm64-v8a-release.aar
   script:
     - aws s3 cp bin/$BUILD_APK_FILENAME__64 s3://build.lbry.io/android/sdk-build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__64
     - aws s3 cp bin/$BUILD_APK_FILENAME__32 s3://build.lbry.io/android/sdk-build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__32
@@ -81,7 +85,7 @@ release aar:
   before_script:
     - pip install awscli githubrelease
     - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
-    - export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-release__arm.aar
+    - export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-armeabi-v7a-release.aar
-    - export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-release__arm64.aar
+    - export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-arm64-v8a-release.aar
   script:
     - githubrelease release lbryio/lbry-android-sdk create $CI_COMMIT_TAG --publish bin/$BUILD_APK_FILENAME__64 bin/$BUILD_APK_FILENAME__32

.gitsecret/paths/mapping.cfg

@@ -1,2 +0,0 @@
-lbry-android.keystore:
-p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json

buildozer.spec.arm.ci

@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, netifaces, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.11.0, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -118,7 +118,7 @@ android.ndk_path = ~/.buildozer/android/crystax-ndk-10.3.2
 # (bool) If True, then skip trying to update the Android sdk
 # This can be useful to avoid excess Internet downloads or save time
 # when an update is due and you just want to test/build your package
-#android.skip_update = False
+android.skip_update = True
 
 # (str) Android entry point, default is ok for Kivy-based app
 #android.entrypoint = org.renpy.android.PythonActivity

buildozer.spec.arm64.ci

@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, netifaces, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.11.0, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -118,7 +118,7 @@ android.ndk_path = ~/.buildozer/android/crystax-ndk-10.3.2
 # (bool) If True, then skip trying to update the Android sdk
 # This can be useful to avoid excess Internet downloads or save time
 # when an update is due and you just want to test/build your package
-#android.skip_update = False
+android.skip_update = True
 
 # (str) Android entry point, default is ok for Kivy-based app
 #android.entrypoint = org.renpy.android.PythonActivity

buildozer.spec.sample

@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, netifaces, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.11.0, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -118,7 +118,7 @@ android.ndk_path = ~/.buildozer/android/crystax-ndk-10.3.2
 # (bool) If True, then skip trying to update the Android sdk
 # This can be useful to avoid excess Internet downloads or save time
 # when an update is due and you just want to test/build your package
-#android.skip_update = False
+android.skip_update = True
 
 # (str) Android entry point, default is ok for Kivy-based app
 #android.entrypoint = org.renpy.android.PythonActivity

buildozer.spec.vagrant

@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.11.0, keyring==10.4.0, defusedxml, netifaces, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -118,7 +118,7 @@ android.ndk_path = ~/.buildozer/android/crystax-ndk-10.3.2
 # (bool) If True, then skip trying to update the Android sdk
 # This can be useful to avoid excess Internet downloads or save time
 # when an update is due and you just want to test/build your package
-#android.skip_update = False
+android.skip_update = True
 
 # (str) Android entry point, default is ok for Kivy-based app
 #android.entrypoint = org.renpy.android.PythonActivity
@@ -275,4 +275,4 @@ warn_on_root = 1
 #    Then, invoke the command line with the "demo" profile:
 #
 #buildozer --profile demo android debug
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2020.12.5, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2020.12.5, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"

docker/Dockerfile.python3.10.platform-28

@@ -0,0 +1,47 @@
+FROM ubuntu:20.04
+
+RUN export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+RUN dpkg --add-architecture i386
+RUN apt-get -y update && apt-get -y install curl ca-certificates software-properties-common gpg-agent wget
+RUN add-apt-repository ppa:deadsnakes/ppa -y
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake \
+    libtool libffi-dev build-essential python3.10 python3.10-dev python3.10-venv ccache git \
+    libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \
+    libidn11:i386 openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk
+
+RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3
+RUN rm -f /usr/bin/python && ln -s /usr/bin/python3.10 /usr/bin/python
+RUN wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py
+RUN pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml
+
+RUN mkdir -p cd ~/.buildozer/android/platform/
+
+RUN wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \
+    wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \
+    wget 'https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip' -P ~/.buildozer/android/platform/ && \
+    wget 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip' -P ~/.buildozer/android/platform
+
+RUN tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \
+    mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk && \
+    unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk/platforms && \
+    mv ~/.buildozer/android/platform/android-sdk/platforms/android-9 ~/.buildozer/android/platform/android-sdk/platforms/android-28 && \
+    mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \
+    unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \
+    mkdir -p ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/cmdline-tools/cmdline-tools ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0 && \
+    cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0/* ~/.buildozer/android/platform/android-sdk/tools
+
+RUN rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \
+    rm ~/.buildozer/android/platform/platform-28_r06.zip && \
+    rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip && \
+    rm ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip
+
+RUN mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \
+    echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license
+
+RUN git clone https://github.com/lbryio/buildozer.git
+RUN cd buildozer && python setup.py install && cd ..
+
+CMD ["/bin/bash"]

docker/Dockerfile.python39.platform-28

@@ -1,41 +1,47 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 RUN dpkg --add-architecture i386
 RUN apt-get -y update && apt-get -y install curl ca-certificates software-properties-common gpg-agent wget
 RUN add-apt-repository ppa:deadsnakes/ppa -y
-RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake libtool libffi-dev \
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake \
-    build-essential python3.9 python3.9-dev python3.9-venv python3-pip ccache git libncurses5:i386 libstdc++6:i386 \
+    libtool libffi-dev build-essential python3.9 python3.9-dev python3.9-venv ccache git \
-    libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
+    libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \
-    python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk
+    libidn11:i386 openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk
 
 RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.9 /usr/bin/python3
-RUN rm /usr/bin/python && ln -s /usr/bin/python2.7 /usr/bin/python
+RUN rm -f /usr/bin/python && ln -s /usr/bin/python3.9 /usr/bin/python
-
+RUN wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py
-RUN pip install --upgrade cython==0.29.15 setuptools zipp==1.2.0 importlib-resources==1.0.2 importlib-metadata==0.20 virtualenv==20.4.7 appdirs sh colorama==0.3.3 jinja2 six pep517\<0.7.0 toml
+RUN pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml
-
-RUN git clone https://github.com/lbryio/buildozer.git
-RUN cd buildozer && python2 setup.py install && cd ..
 
 RUN mkdir -p cd ~/.buildozer/android/platform/
 
 RUN wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \
     wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \
     wget 'https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip' -P ~/.buildozer/android/platform/ && \
-    tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \
+    wget 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip' -P ~/.buildozer/android/platform
-    mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23 && \
+
-    unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms && \
+RUN tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \
-    mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-28 && \
+    mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk && \
-    mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools && \
+    unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk/platforms && \
-    unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/platforms/android-9 ~/.buildozer/android/platform/android-sdk/platforms/android-28 && \
-    mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-9 ~/.buildozer/android/platform/android-sdk-23/build-tools/28.0.3 && \
+    mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \
-    rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \
+    unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \
+    mkdir -p ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/cmdline-tools/cmdline-tools ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0 && \
+    cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0/* ~/.buildozer/android/platform/android-sdk/tools
+
+RUN rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \
     rm ~/.buildozer/android/platform/platform-28_r06.zip && \
-    rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip
+    rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip && \
+    rm ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip
 
-RUN mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses && \
+RUN mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \
-    echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
+    echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license
 
-RUN pip3 install --upgrade setuptools==51.0.0
+RUN git clone https://github.com/lbryio/buildozer.git
+RUN cd buildozer && python setup.py install && cd ..
 
 CMD ["/bin/bash"]

p4a/pythonforandroid/archs.py

@@ -83,7 +83,7 @@ class Arch(object):
         env['CFLAGS'] += ' -isysroot {} '.format(sysroot)
         env['CFLAGS'] += '-I' + join(self.ctx.get_python_install_dir(),
                                      'include/python{}'.format(
-                                         self.ctx.python_recipe.version[0:3])
+                                         self.ctx.python_recipe.version)
                                     )
 
         env['LDFLAGS'] += '--sysroot={} '.format(self.ctx.ndk_platform)
@@ -157,7 +157,7 @@ class Arch(object):
         if self.ctx.python_recipe and self.ctx.python_recipe.from_crystax:
             # For crystax python, we can't use the host python headers:
             env["CFLAGS"] += ' -I{}/sources/python/{}/include/python/'.\
-                format(self.ctx.ndk_dir, self.ctx.python_recipe.version[0:3])
+                format(self.ctx.ndk_dir, self.ctx.python_recipe.version)
         env['STRIP'] = '{}-strip --strip-unneeded'.format(command_prefix)
         env['MAKE'] = 'make -j5'
         env['READELF'] = '{}-readelf'.format(command_prefix)

p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonUtil.java

@@ -33,6 +33,7 @@ public class PythonUtil {
         libsList.add("python3.7m");
         libsList.add("python3.8");
         libsList.add("python3.9");
+        libsList.add("python3.10");
         libsList.add("main");
         return libsList;
     }
@@ -52,7 +53,7 @@ public class PythonUtil {
                 // load, and it has failed, give a more
                 // general error
                 Log.v(TAG, "Library loading error: " + e.getMessage());
-                if (lib.startsWith("python3.9") && !foundPython) {
+                if (lib.startsWith("python3.10") && !foundPython) {
                     throw new RuntimeException("Could not load any libpythonXXX.so");
                 } else if (lib.startsWith("python")) {
                     continue;

p4a/pythonforandroid/recipe.py

@@ -749,8 +749,9 @@ class PythonRecipe(Recipe):
         host_build = Recipe.get_recipe(host_name, self.ctx).get_build_dir()
         if host_name in ['hostpython2', 'hostpython3']:
             return join(host_build, 'native-build', 'python')
-        elif host_name in ['hostpython3crystax', 'hostpython2legacy']:
+        elif host_name in ['hostpython3crystax']:
-            return join(host_build, 'hostpython')
+            python_recipe = Recipe.get_recipe(host_name, self.ctx)
+            return python_recipe.python_exe
         else:
             python_recipe = self.ctx.python_recipe
             return 'python{}'.format(python_recipe.version)

recipes/cffi/__init__.py

@@ -5,7 +5,7 @@ from pythonforandroid.recipe import CompiledComponentsPythonRecipe
 
 class CffiRecipe(CompiledComponentsPythonRecipe):
     name = 'cffi'
-    version = '1.13.2'
+    version = '1.14.6'
     url = 'https://pypi.python.org/packages/source/c/cffi/cffi-{version}.tar.gz'
 
     depends = [('python2', 'python3crystax'), 'setuptools', 'pycparser', 'libffi']
@@ -45,7 +45,7 @@ class CffiRecipe(CompiledComponentsPythonRecipe):
         ])
         if self.ctx.ndk == 'crystax':
             # only keeps major.minor (discards patch)
-            python_version = self.ctx.python_recipe.version[0:3]
+            python_version = self.ctx.python_recipe.version
             ndk_dir_python = os.path.join(self.ctx.ndk_dir, 'sources/python/', python_version)
             env['LDFLAGS'] += ' -L{}'.format(os.path.join(ndk_dir_python, 'libs', arch.arch))
             env['LDFLAGS'] += ' -lpython{}'.format(python_version)

recipes/coincurve/__init__.py

@@ -21,7 +21,7 @@ class CoincurveRecipe(CompiledComponentsPythonRecipe):
         env['LDFLAGS'] += ' -L{}'.format(os.path.join(libsecp256k1_dir, '.libs'))
         env['CFLAGS'] += ' -I' + os.path.join(libsecp256k1_dir, 'include')
         # only keeps major.minor (discards patch)
-        python_version = self.ctx.python_recipe.version[0:3]
+        python_version = self.ctx.python_recipe.version
         # required additional library and path for Crystax
         if self.ctx.ndk == 'crystax':
             ndk_dir_python = os.path.join(self.ctx.ndk_dir, 'sources/python/', python_version)

recipes/cryptography/__init__.py

@@ -23,7 +23,7 @@ class CryptographyRecipe(CompiledComponentsPythonRecipe):
 
         if self.ctx.ndk == 'crystax':
             # only keeps major.minor (discards patch)
-            python_version = self.ctx.python_recipe.version[0:3]
+            python_version = self.ctx.python_recipe.version
             ndk_dir_python = os.path.join(self.ctx.ndk_dir, 'sources/python/', python_version)
             env['LDFLAGS'] += ' -L{}'.format(os.path.join(ndk_dir_python, 'libs', arch.arch))
             env['LDFLAGS'] += ' -lpython{}'.format(python_version)

recipes/hostpython3crystax/__init__.py

@@ -42,5 +42,9 @@ class Hostpython3Recipe(Recipe):
         link_dest = join(self.get_build_dir(), 'hostpython')
         shprint(sh.ln, '-sf', system_python, link_dest)
 
+    @property
+    def python_exe(self):
+        return join(self.get_build_dir(), 'hostpython')
+
 
 recipe = Hostpython3Recipe()

recipes/idna/__init__.py

@@ -1,14 +0,0 @@
-from pythonforandroid.recipe import PythonRecipe
-
-
-class IdnaRecipe(PythonRecipe):
-    name = 'idna'
-    version = '2.6'
-    url = 'https://github.com/kjd/idna/archive/v{version}.tar.gz'
-
-    depends = [('python2', 'python3crystax'), 'setuptools']
-
-    call_hostpython_via_targetpython = False
-
-
-recipe = IdnaRecipe()

recipes/netifaces/__init__.py

@@ -1,4 +1,3 @@
-
 import glob
 from pythonforandroid.recipe import CompiledComponentsPythonRecipe, Recipe
 from os.path import join
@@ -20,7 +19,7 @@ class NetifacesRecipe(CompiledComponentsPythonRecipe):
 
         if self.ctx.ndk == 'crystax':
             # only keeps major.minor (discards patch)
-            python_version = self.ctx.python_recipe.version[0:3]
+            python_version = self.ctx.python_recipe.version
             ndk_dir_python = os.path.join(self.ctx.ndk_dir, 'sources/python/', python_version)
             env['LDFLAGS'] += ' -L{}'.format(os.path.join(ndk_dir_python, 'libs', arch.arch))
             env['LDFLAGS'] += ' -lpython{}'.format(python_version)

recipes/openssl/__init__.py

@@ -8,7 +8,7 @@ import sh
 
 class OpenSSLRecipe(Recipe):
     version = '1.1'
-    url_version = '1.1.1b'
+    url_version = '1.1.1k'
     url = 'https://www.openssl.org/source/openssl-{url_version}.tar.gz'
 
     @property

recipes/python3crystax/__init__.py

@@ -34,7 +34,8 @@ LATEST_FULL_VERSION = {
     '3.5': '3.5.1',
     '3.6': '3.6.6',
     '3.7': '3.7.1',
-    '3.9': '3.9.6'
+    '3.9': '3.9.6',
+    '3.10': '3.10.0'
 }
 
 def realpath(fname):
@@ -62,19 +63,22 @@ def realpath(fname):
     return os.sep.join(abs_path)
 
 class Python3Recipe(TargetPythonRecipe):
-    version = '3.9'
+    version = '3.10'
     url = ''
     name = 'python3crystax'
 
-    depends = ['hostpython3crystax']
+    depends = ['hostpython3crystax', 'sqlite3', 'openssl']
     conflicts = ['python2', 'python3']
 
     from_crystax = True
 
     def download_if_necessary(self):
-        if 'openssl' in self.ctx.recipe_build_order or self.version in ('3.6', '3.7', '3.9'):
+        if 'openssl' in self.ctx.recipe_build_order or self.version in ('3.6', '3.7', '3.9', '3.10'):
             full_version = LATEST_FULL_VERSION[self.version]
-            Python3Recipe.url = 'https://www.python.org/ftp/python/{0}.{1}.{2}/Python-{0}.{1}.{2}.tgz'.format(*full_version.split('.'))
+            version_suffix = 'rc1'
+            version_params = full_version.split('.')
+            version_params.append(version_suffix)
+            Python3Recipe.url = 'https://www.python.org/ftp/python/{0}.{1}.{2}/Python-{0}.{1}.{2}{3}.tgz'.format(*version_params)
             super(Python3Recipe, self).download_if_necessary()
 
     def get_dir_name(self):
@@ -123,6 +127,36 @@ class Python3Recipe(TargetPythonRecipe):
         return join(self.ctx.ndk_dir, 'sources', 'python', self.major_minor_version_string,
                     'libs', arch_name)
 
+    def check_for_sqlite3so(self, sqlite_recipe, arch):
+        dynlib_dir = join(self.ctx.ndk_dir, 'sources', 'python', self.version,
+                          'libs', arch.arch, 'modules')
+
+        if os.path.exists(join(dynlib_dir, 'libsqlite3.so')):
+            return 10, 'Shared object exists in ndk'
+
+        major_version = sqlite_recipe.version.split('.')[0]
+        # find out why _ssl.so is missin
+        source_dir = join(self.ctx.ndk_dir, 'sources', 'sqlite', major_version)
+        if not os.path.exists(source_dir):
+            return 0, 'sqlite3 version not present'
+
+        # these two path checks are lifted straight from:
+        # crystax-ndk/build/tools/build-target-python.sh
+        if not os.path.exists(join(source_dir, 'Android.mk')):
+            return 1.1, 'Android.mk is missing in sqlite3 source'
+
+        include_dir = join(source_dir, 'include')
+        if not os.path.exists(join(include_dir, 'sqlite3.h')):
+            return 1.2, 'sqlite3 include dir missing'
+
+        # lastly a check to see whether shared objects for the correct arch
+        # is present in the ndk
+        if not os.path.exists(join(source_dir, 'libs', arch.arch, 'libsqlite3.a')):
+            return 2, 'sqlite3 libs for this arch is missing in ndk'
+
+        return 5, 'Ready to recompile python'
+
+
     def check_for_sslso(self, ssl_recipe, arch):
         # type: (Recipe, str)
         dynlib_dir = join(self.ctx.ndk_dir, 'sources', 'python', self.version,
@@ -132,7 +166,6 @@ class Python3Recipe(TargetPythonRecipe):
             return 10, 'Shared object exists in ndk'
 
         # find out why _ssl.so is missing
-
         source_dir = join(self.ctx.ndk_dir, 'sources', 'openssl', ssl_recipe.version)
         if not os.path.exists(source_dir):
             return 0, 'Openssl version not present'
@@ -151,8 +184,6 @@ class Python3Recipe(TargetPythonRecipe):
                                    'opensslconf_{}.h'.format(under_scored_arch))):
             return 1.3, 'Opensslconf arch header missing from include'
 
-
-
         # lastly a check to see whether shared objects for the correct arch
         # is present in the ndk
         if not os.path.exists(join(source_dir, 'libs', arch.arch)):
@@ -167,37 +198,52 @@ class Python3Recipe(TargetPythonRecipe):
             if os.path.exists(mk_path):
                 return mk_path
 
+    def find_sqlite3_Android_mk(self):
+        sqlite_dir = join(self.ctx.ndk_dir, 'sources', 'sqlite')
+        for version in os.listdir(sqlite_dir):
+            mk_path = join(sqlite_dir, version, 'Android.mk')
+            if os.path.exists(mk_path):
+                return mk_path
+
     def prebuild_arch(self, arch):
         super(Python3Recipe, self).prebuild_arch(arch)
-        if self.version in ('3.6', '3.7', '3.9'):
+        if self.version in ('3.6', '3.7', '3.9', '3.10'):
-            Python3Recipe.patches = [
+            patches = ['remove_android_api_check{}'.format('_3.10' if self.version == '3.10' else '')]
-                'patch/patch_python3.6.patch',
+            if self.version in ('3.6', '3.7'):
-                'patch/remove_android_api_check.patch',
+                patches += [
-                'patch/selectors.patch'
+                    'patch_python3.6',
+                    'selectors'
                 ]
 
-            if self.version in ('3.9'):
+            if self.version in ('3.9', '3.10'):
-                Python3Recipe.patches = [
+                if self.version == '3.9':
-                    'patch/remove_android_api_check.patch',
+                    patches += ['strdup']
-                    'patch/patch_python3.9.patch',
+
-                    'patch/platlibdir.patch',
+                if self.version == '3.10':
-                    'patch/strdup.patch',
+                    patches += ['py3.10.0_posixmodule']
+
+                patches += [
+                    'patch_python3.9',
+                    'platlibdir',
 
                     # from https://github.com/kivy/python-for-android/blob/develop/pythonforandroid/recipes/python3/__init__.py#L63
-                    'patch/pyconfig_detection.patch',
+                    'pyconfig_detection',
-                    'patch/reproducible-buildinfo.diff',
+                    'reproducible-buildinfo',
-                    'patch/py3.8.1.patch'
+                    'py3.8.1'
                 ]
 
                 if sh.which('lld') is not None:
-                    Python3Recipe.patches += ['patch/py3.8.1_fix_cortex_a8.patch']
+                    patches += ['py3.8.1_fix_cortex_a8']
+
+
+            Python3Recipe.patches = []
+            for patch_name in patches:
+                Python3Recipe.patches.append('patch/{}.patch'.format(patch_name))
 
             build_dir = self.get_build_dir(arch.arch)
 
             # copy bundled libffi to _ctypes
             sh.cp("-r", join(self.get_recipe_dir(), 'libffi'), join(build_dir, 'Modules', '_ctypes'))
-            print #####Copied bundle####'
-
 
             shprint(sh.ln, '-sf',
                            realpath(join(build_dir, 'Lib/site-packages/README.txt')),
@@ -219,18 +265,61 @@ class Python3Recipe(TargetPythonRecipe):
             shprint(sh.rm, '-f', join(ndk_sources_python_dir, '{}/Android.mk.tmp'.format(self.version)))
 
     def build_arch(self, arch):
+        rebuild = False
+
+        if self.from_crystax and 'sqlite3' in self.ctx.recipe_build_order:
+            info('checking sqlite3 in crystax-python')
+            sqlite_recipe = self.get_recipe('sqlite3', self.ctx)
+            stage, msg = self.check_for_sqlite3so(sqlite_recipe, arch)
+            major_version = sqlite_recipe.version.split('.')[0]
+            info(msg)
+            sqlite3_build_dir = sqlite_recipe.get_build_dir(arch.arch)
+            sqlite3_ndk_dir = join(self.ctx.ndk_dir, 'sources', 'sqlite', major_version)
+
+            if stage < 2:
+                info('copying sqlite3 Android.mk to ndk')
+                ensure_dir(sqlite3_ndk_dir)
+                if stage < 1.2:
+                    # copy include folder and Android.mk to ndk
+                    mk_path = self.find_sqlite3_Android_mk()
+                    if mk_path is None:
+                        raise IOError('Android.mk file could not be found in '
+                                      'any versions in ndk->sources->sqlite')
+                    if not ssl_recipe.version in mk_path:
+                        shprint(sh.cp, '-f', mk_path, sqlite3_ndk_dir)
+
+                include_dir = join(sqlite3_build_dir, 'include')
+                if stage < 1.3:
+                    ndk_include_dir = join(sqlite3_ndk_dir, 'include')
+                    ensure_dir(ndk_include_dir)
+                    shprint(sh.cp, '-f', join(sqlite3_build_dir, 'sqlite3.h'), join(ndk_include_dir, 'sqlite3.h'))
+                    shprint(sh.cp, '-f', join(sqlite3_build_dir, 'sqlite3ext.h'), join(ndk_include_dir, 'sqlite3ext.h'))
+
+            if stage < 3:
+                info('copying sqlite3 libs to ndk')
+                arch_ndk_lib = join(sqlite3_ndk_dir, 'libs', arch.arch)
+                ensure_dir(arch_ndk_lib)
+                shprint(sh.ln, '-sf',
+                               realpath(join(sqlite3_build_dir, 'libsqlite3')),
+                               join(sqlite3_build_dir, 'libsqlite3.a'))
+                libs = ['libs/{}/libsqlite3.a'.format(arch.arch)]
+                cmd = [join(sqlite3_build_dir, lib) for lib in libs] + [arch_ndk_lib]
+                shprint(sh.cp, '-f', *cmd)
+
+            if stage < 10:
+                rebuild = True
+
         # If openssl is needed we may have to recompile cPython to get the
         # ssl.py module working properly
         if self.from_crystax and 'openssl' in self.ctx.recipe_build_order:
-            info('Openssl and crystax-python combination may require '
+            info('openssl and crystax-python combination may require '
                  'recompilation of python...')
             ssl_recipe = self.get_recipe('openssl', self.ctx)
             stage, msg = self.check_for_sslso(ssl_recipe, arch)
             stage = 0 if stage < 5 else stage
             info(msg)
             openssl_build_dir = ssl_recipe.get_build_dir(arch.arch)
-            openssl_ndk_dir = join(self.ctx.ndk_dir, 'sources', 'openssl',
+            openssl_ndk_dir = join(self.ctx.ndk_dir, 'sources', 'openssl', ssl_recipe.version)
-                                   ssl_recipe.version)
 
             if stage < 2:
                 info('Copying openssl headers and Android.mk to ndk')
@@ -279,6 +368,9 @@ class Python3Recipe(TargetPythonRecipe):
                 shprint(sh.cp, '-f', *cmd)
 
             if stage < 10:
+                rebuild = True
+
+        if rebuild:
             info('Recompiling python-crystax')
             self.patch_dev_defaults(ssl_recipe)
             build_script = join(self.ctx.ndk_dir, 'build', 'tools',

recipes/python3crystax/android.mk.3.10

@@ -25,7 +25,6 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Python/getopt.c \
   $(MY_PYTHON_SRC_ROOT)/Python/getplatform.c \
   $(MY_PYTHON_SRC_ROOT)/Python/getversion.c \
-  $(MY_PYTHON_SRC_ROOT)/Python/graminit.c \
   $(MY_PYTHON_SRC_ROOT)/Python/hamt.c \
   $(MY_PYTHON_SRC_ROOT)/Python/hashtable.c \
   $(MY_PYTHON_SRC_ROOT)/Python/import.c \
@@ -36,7 +35,6 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Python/mysnprintf.c \
   $(MY_PYTHON_SRC_ROOT)/Python/mystrtoul.c \
   $(MY_PYTHON_SRC_ROOT)/Python/pathconfig.c \
-  $(MY_PYTHON_SRC_ROOT)/Python/peephole.c \
   $(MY_PYTHON_SRC_ROOT)/Python/preconfig.c \
   $(MY_PYTHON_SRC_ROOT)/Python/pyarena.c \
   $(MY_PYTHON_SRC_ROOT)/Python/pyctype.c \
@@ -51,27 +49,21 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Python/Python-ast.c \
   $(MY_PYTHON_SRC_ROOT)/Python/pythonrun.c \
   $(MY_PYTHON_SRC_ROOT)/Python/pytime.c \
-  $(MY_PYTHON_SRC_ROOT)/Python/strdup.c \
   $(MY_PYTHON_SRC_ROOT)/Python/structmember.c \
+  $(MY_PYTHON_SRC_ROOT)/Python/suggestions.c \
   $(MY_PYTHON_SRC_ROOT)/Python/symtable.c \
   $(MY_PYTHON_SRC_ROOT)/Python/sysmodule.c \
   $(MY_PYTHON_SRC_ROOT)/Python/thread.c \
   $(MY_PYTHON_SRC_ROOT)/Python/traceback.c \
   $(MY_PYTHON_SRC_ROOT)/Python/_warnings.c \
   \
-  $(MY_PYTHON_SRC_ROOT)/Parser/acceler.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/grammar1.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/listnode.c \
   $(MY_PYTHON_SRC_ROOT)/Parser/myreadline.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/node.c \
   $(MY_PYTHON_SRC_ROOT)/Parser/parser.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/parsetok.c \
+  $(MY_PYTHON_SRC_ROOT)/Parser/peg_api.c \
+  $(MY_PYTHON_SRC_ROOT)/Parser/pegen.c \
+  $(MY_PYTHON_SRC_ROOT)/Parser/string_parser.c \
   $(MY_PYTHON_SRC_ROOT)/Parser/token.c \
   $(MY_PYTHON_SRC_ROOT)/Parser/tokenizer.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/pegen/parse.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/pegen/parse_string.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/pegen/peg_api.c \
-  $(MY_PYTHON_SRC_ROOT)/Parser/pegen/pegen.c \
   \
   $(MY_PYTHON_SRC_ROOT)/Objects/abstract.c \
   $(MY_PYTHON_SRC_ROOT)/Objects/accu.c \
@@ -115,6 +107,7 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Objects/typeobject.c \
   $(MY_PYTHON_SRC_ROOT)/Objects/unicodectype.c \
   $(MY_PYTHON_SRC_ROOT)/Objects/unicodeobject.c \
+  $(MY_PYTHON_SRC_ROOT)/Objects/unionobject.c \
   $(MY_PYTHON_SRC_ROOT)/Objects/weakrefobject.c \
   \
   $(MY_PYTHON_SRC_ROOT)/Modules/_abc.c \
@@ -150,7 +143,6 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_opcode.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_operator.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/ossaudiodev.c \
-  $(MY_PYTHON_SRC_ROOT)/Modules/parsermodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/posixmodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_posixsubprocess.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/pwdmodule.c \
@@ -166,6 +158,7 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/socketmodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_sre.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_stat.c \
+  $(MY_PYTHON_SRC_ROOT)/Modules/_statisticsmodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_struct.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/symtablemodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/termios.c \
@@ -178,9 +171,12 @@ LOCAL_SRC_FILES := config.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/unicodedata.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/_weakref.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/xxlimited.c \
+  $(MY_PYTHON_SRC_ROOT)/Modules/xxlimited_35.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/xxmodule.c \
+  $(MY_PYTHON_SRC_ROOT)/Modules/_xxsubinterpretersmodule.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/xxsubtype.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/zlibmodule.c \
+  $(MY_PYTHON_SRC_ROOT)/Modules/_zoneinfo.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/cjkcodecs/_codecs_cn.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/cjkcodecs/_codecs_hk.c \
   $(MY_PYTHON_SRC_ROOT)/Modules/cjkcodecs/_codecs_iso2022.c \

recipes/python3crystax/config.c.3.10

@@ -26,6 +26,7 @@ extern PyObject* PyInit__thread(void);
 extern PyObject* PyInit__codecs(void);
 extern PyObject* PyInit__weakref(void);
 extern PyObject* PyInit_xxsubtype(void);
+extern PyObject* PyInit__xxsubinterpreters(void);
 extern PyObject* PyInit__random(void);
 extern PyObject* PyInit_itertools(void);
 extern PyObject* PyInit__collections(void);
@@ -35,7 +36,6 @@ extern PyObject* PyInit__symtable(void);
 extern PyObject* PyInit_mmap(void);
 extern PyObject* PyInit__csv(void);
 extern PyObject* PyInit__sre(void);
-extern PyObject* PyInit_parser(void);
 extern PyObject* PyInit__struct(void);
 extern PyObject* PyInit__datetime(void);
 extern PyObject* PyInit__functools(void);
@@ -96,12 +96,12 @@ struct _inittab _PyImport_Inittab[] = {
     {"mmap", PyInit_mmap},
     {"_csv", PyInit__csv},
     {"_sre", PyInit__sre},
-    {"parser", PyInit_parser},
     {"_struct", PyInit__struct},
     {"_datetime", PyInit__datetime},
     {"_functools", PyInit__functools},
 
     {"xxsubtype", PyInit_xxsubtype},
+    {"_xxsubinterpreters", PyInit__xxsubinterpreters},
     {"zlib", PyInit_zlib},
 
     /* CJK codecs */

recipes/python3crystax/interpreter.c.3.10

@@ -9,7 +9,7 @@
 
 #define PYTHON3_STDLIB_REL_PATH "stdlib.zip"
 #define PYTHON3_MODULES_REL_PATH "modules"
-#define PYTHON3_DLL_REL_PATH "libpython3.9.so"
+#define PYTHON3_DLL_REL_PATH "libpython3.10.so"
 
 #define SYS_PATH_BUFFER_SIZE (2*(PATH_MAX + 1))
 

recipes/python3crystax/patch/py3.10.0_posixmodule.patch

@@ -0,0 +1,12 @@
+--- a/Modules/posixmodule.c	2021-08-02 20:53:59.000000000 +0100
++++ b/Modules/posixmodule.c	2021-08-21 12:06:16.897465398 +0100
+@@ -15384,6 +15384,9 @@
+ #ifdef HAVE_EVENTFD
+     if (PyModule_AddIntMacro(m, EFD_CLOEXEC)) return -1;
+     if (PyModule_AddIntMacro(m, EFD_NONBLOCK)) return -1;
++#  ifndef EFD_SEMAPHORE
++#    define EFD_SEMAPHORE (1 << 0)
++#  endif
+     if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
+ #endif
+ 

recipes/python3crystax/patch/remove_android_api_check_3.10.patch

@@ -0,0 +1,36 @@
+--- a/configure	2021-08-02 20:53:59.000000000 +0100
++++ b/configure	2021-08-21 11:13:50.508648380 +0100
+@@ -6241,33 +6241,6 @@
+ #endif
+ EOF
+ 
+-if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
+-  ANDROID_API_LEVEL=`sed -n -e '/__ANDROID_API__/d' -e 's/^android_api = //p' conftest.out`
+-  _arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out`
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5
+-printf "%s\n" "$ANDROID_API_LEVEL" >&6; }
+-  if test -z "$ANDROID_API_LEVEL"; then
+-    echo 'Fatal: you must define __ANDROID_API__'
+-    exit 1
+-  fi
+-
+-printf "%s\n" "#define ANDROID_API_LEVEL $ANDROID_API_LEVEL" >>confdefs.h
+-
+-
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Android arm ABI" >&5
+-printf %s "checking for the Android arm ABI... " >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_arm_arch" >&5
+-printf "%s\n" "$_arm_arch" >&6; }
+-  if test "$_arm_arch" = 7; then
+-    BASECFLAGS="${BASECFLAGS} -mfloat-abi=softfp -mfpu=vfpv3-d16"
+-    LDFLAGS="${LDFLAGS} -march=armv7-a -Wl,--fix-cortex-a8"
+-  fi
+-else
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
+-printf "%s\n" "not Android" >&6; }
+-fi
+-rm -f conftest.c conftest.out
+-
+ # Check for unsupported systems
+ case $ac_sys_system/$ac_sys_release in
+ atheos*|Linux*/1*)

recipes/six/__init__.py

@@ -1,10 +0,0 @@
-
-from pythonforandroid.recipe import PythonRecipe
-
-
-class SixRecipe(PythonRecipe):
-    version = '1.9.0'
-    url = 'https://pypi.python.org/packages/source/s/six/six-{version}.tar.gz'
-    depends = [('python2', 'python3crystax')]
-
-recipe = SixRecipe()

recipes/sqlite3/Android.mk

@@ -1,11 +1,16 @@
-LOCAL_PATH := $(call my-dir)/..
+TOP_PATH := $(call my-dir)/..
 
 include $(CLEAR_VARS)
-
+LOCAL_PATH := $(TOP_PATH)
 LOCAL_SRC_FILES := sqlite3.c
-
+LOCAL_MODULE := sqlite3_static
-LOCAL_MODULE := sqlite3
+LOCAL_MODULE_FILENAME := libsqlite3
-
+LOCAL_CFLAGS := \
-LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS4
+  -DSQLITE_BYTEORDER=1234 \
-
+  -DSQLITE_DIRECT_OVERFLOW_READ \
-include $(BUILD_SHARED_LIBRARY)
+  -DSQLITE_ENABLE_ATOMIC_WRITE \
+  -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
+  -DSQLITE_ENABLE_FTS4 \
+  -DSQLITE_ENABLE_FTS5 \
+  -D_FILE_OFFSET_BITS=64
+include $(BUILD_STATIC_LIBRARY)

recipes/sqlite3/__init__.py

@@ -4,31 +4,35 @@ from os.path import join, exists
 import sh
 
 class Sqlite3Recipe(NDKRecipe):
-    version = '3.24.0'
+    version = '3.36.0'
     # Don't forget to change the URL when changing the version
-    url = 'https://www.sqlite.org/2018/sqlite-amalgamation-3240000.zip'
+    url = 'https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip'
     generated_libraries = ['sqlite3']
 
     def should_build(self, arch):
-        return not self.has_libs(arch, 'libsqlite3.so')
+        return not self.has_libs(arch, 'libsqlite3.a')
 
     def prebuild_arch(self, arch):
-        super(Sqlite3Recipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         # Copy the Android make file
-
         sh.mkdir('-p', join(self.get_build_dir(arch.arch), 'jni'))
         shutil.copyfile(join(self.get_recipe_dir(), 'Android.mk'),
                         join(self.get_build_dir(arch.arch), 'jni/Android.mk'))
 
     def build_arch(self, arch, *extra_args):
-        super(Sqlite3Recipe, self).build_arch(arch)
+        super().build_arch(arch)
-        # Copy the shared library
+        # Copy the static library
-        shutil.copyfile(join(self.get_build_dir(arch.arch), 'libs', arch.arch, 'libsqlite3.so'),
+        # (which doesn't get placed in the libs folder for some reason so we force that to happen)
-                        join(self.ctx.get_libs_dir(arch.arch), 'libsqlite3.so'))
+        sh.mkdir('-p', join(self.get_build_dir(arch.arch), 'libs', arch.arch))
+        shutil.copyfile(join(self.get_build_dir(arch.arch), 'obj', 'local', arch.arch, 'libsqlite3.a'),
+                        join(self.get_build_dir(arch.arch), 'libs', arch.arch, 'libsqlite3.a'))
+        shutil.copyfile(join(self.get_build_dir(arch.arch), 'libs', arch.arch, 'libsqlite3.a'),
+                        join(self.ctx.get_libs_dir(arch.arch), 'libsqlite3.a'))
 
     def get_recipe_env(self, arch):
-        env = super(Sqlite3Recipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         env['NDK_PROJECT_PATH'] = self.get_build_dir(arch.arch)
         return env
 
+
 recipe = Sqlite3Recipe()

scripts/build-binary.mk

@@ -0,0 +1,831 @@
+# Copyright (C) 2008, 2014, 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Check that LOCAL_MODULE is defined, then restore its LOCAL_XXXX values
+$(call assert-defined,LOCAL_MODULE)
+$(call module-restore-locals,$(LOCAL_MODULE))
+
+# For now, only support target (device-specific modules).
+# We may want to introduce support for host modules in the future
+# but that is too experimental for now.
+#
+my := TARGET_
+
+# LOCAL_MAKEFILE must also exist and name the Android.mk that
+# included the module build script.
+#
+$(call assert-defined,LOCAL_MAKEFILE LOCAL_BUILD_SCRIPT LOCAL_BUILT_MODULE)
+
+# A list of LOCAL_XXX variables that are ignored for static libraries.
+# Print a warning if they are present inside a module definition to let
+# the user know this won't do what he/she expects.
+not_in_static_libs := \
+    LOCAL_LDFLAGS \
+    LOCAL_LDLIBS \
+    LOCAL_ALLOW_UNDEFINED_SYMBOLS
+
+ifeq ($(call module-get-class,$(LOCAL_MODULE)),STATIC_LIBRARY)
+$(foreach _notvar,$(not_in_static_libs),\
+    $(if $(strip $($(_notvar))),\
+        $(call __ndk_info,WARNING:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): $(_notvar) is always ignored for static libraries)\
+    )\
+)
+endif
+
+# Some developers like to add library names (e.g. -lfoo) to LOCAL_LDLIBS
+# and LOCAL_LDFLAGS directly. This is very fragile and can lead to broken
+# builds and other nasty surprises, because it doesn't tell ndk-build
+# that the corresponding module depends on these files. Emit a warning
+# when we detect this case.
+libs_in_ldflags := $(filter -l% %.so %.a,$(LOCAL_LDLIBS) $(LOCAL_LDFLAGS))
+
+# Remove the system libraries we know about from the warning, it's ok
+# (and actually expected) to link them with -l<name>.
+system_libs := \
+    android \
+    c \
+    dl \
+    jnigraphics \
+    log \
+    m \
+    m_hard \
+    stdc++ \
+    z \
+    EGL \
+    GLESv1_CM \
+    GLESv2 \
+    GLESv3 \
+    OpenSLES \
+    OpenMAXAL \
+    mediandk \
+    atomic
+
+libs_in_ldflags := $(filter-out $(addprefix -l,$(system_libs)), $(libs_in_ldflags))
+
+ifneq (,$(strip $(libs_in_ldflags)))
+  $(call __ndk_info,WARNING:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): non-system libraries in linker flags: $(libs_in_ldflags))
+  $(call __ndk_info,    This is likely to result in incorrect builds. Try using LOCAL_STATIC_LIBRARIES)
+  $(call __ndk_info,    or LOCAL_SHARED_LIBRARIES instead to list the library dependencies of the)
+  $(call __ndk_info,    current module)
+endif
+
+include $(BUILD_SYSTEM)/import-locals.mk
+
+# Check for LOCAL_THIN_ARCHIVE / APP_THIN_ARCHIVE and print a warning if
+# it is defined for non-static library modules.
+thin_archive := $(strip $(LOCAL_THIN_ARCHIVE))
+ifdef thin_archive
+ifneq (STATIC_LIBRARY,$(call module-get-class,$(LOCAL_MODULE)))
+    $(call __ndk_info,WARNING:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): LOCAL_THIN_ARCHIVE is for building static libraries)
+endif
+endif
+
+ifndef thin_archive
+    thin_archive := $(strip $(NDK_APP_THIN_ARCHIVE))
+endif
+# Print a warning if the value is not 'true', 'false' or empty.
+ifneq (,$(filter-out true false,$(thin_archive)))
+    $(call __ndk_info,WARNING:$(LOCAL_MAKEFILE):$(LOCAL_MODULE): Invalid LOCAL_THIN_ARCHIVE value '$(thin_archive)' ignored!)
+    thin_archive :=
+endif
+
+#
+# Ensure that 'make <module>' and 'make clean-<module>' work
+#
+.PHONY: $(LOCAL_MODULE)
+$(LOCAL_MODULE): $(LOCAL_BUILT_MODULE)
+
+cleantarget := clean-$(LOCAL_MODULE)-$(TARGET_ARCH_ABI)
+.PHONY: $(cleantarget)
+clean: $(cleantarget)
+
+$(cleantarget): PRIVATE_ABI         := $(TARGET_ARCH_ABI)
+$(cleantarget): PRIVATE_MODULE      := $(LOCAL_MODULE)
+ifneq ($(LOCAL_BUILT_MODULE_NOT_COPIED),true)
+$(cleantarget): PRIVATE_CLEAN_FILES := $(LOCAL_BUILT_MODULE) \
+                                       $($(my)OBJS)
+else
+$(cleantarget): PRIVATE_CLEAN_FILES := $($(my)OBJS)
+endif
+$(cleantarget)::
+	$(call host-echo-build-step,$(PRIVATE_ABI),Clean) "$(PRIVATE_MODULE) [$(PRIVATE_ABI)]"
+	$(hide) $(call host-rmdir,$(PRIVATE_CLEAN_FILES))
+
+ifeq ($(NDK_APP_DEBUGGABLE),true)
+$(NDK_APP_GDBSETUP): PRIVATE_SRC_DIRS += $(LOCAL_C_INCLUDES) $(LOCAL_PATH)
+endif
+
+# list of generated object files
+LOCAL_OBJECTS :=
+
+# list of generated object files from RS files, subset of LOCAL_OBJECTS
+LOCAL_RS_OBJECTS :=
+
+# always define ANDROID when building binaries
+#
+LOCAL_CFLAGS := -DANDROID $(LOCAL_CFLAGS)
+
+#
+# Add the default system shared libraries to the build
+#
+ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none)
+  LOCAL_SHARED_LIBRARIES += $(TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES)
+else
+  LOCAL_SHARED_LIBRARIES += $(LOCAL_SYSTEM_SHARED_LIBRARIES)
+endif
+
+#
+# Check LOCAL_CPP_EXTENSION
+#
+bad_cpp_extensions := $(strip $(filter-out .%,$(LOCAL_CPP_EXTENSION)))
+ifdef bad_cpp_extensions
+    $(call __ndk_info,WARNING: Invalid LOCAL_CPP_EXTENSION values: $(bad_cpp_extensions))
+    LOCAL_CPP_EXTENSION := $(filter $(bad_cpp_extensions),$(LOCAL_CPP_EXTENSIONS))
+endif
+LOCAL_CPP_EXTENSION := $(strip $(LOCAL_CPP_EXTENSION))
+ifeq ($(LOCAL_CPP_EXTENSION),)
+  # Match the default GCC C++ extensions.
+  LOCAL_CPP_EXTENSION := $(default-c++-extensions)
+endif
+LOCAL_RS_EXTENSION := $(default-rs-extensions)
+
+#
+# Check LOCAL_OBJC_EXTENSION, use '.m' by default
+#
+bad_objc_extensions := $(strip $(filter-out .%,$(LOCAL_OBJC_EXTENSION)))
+ifdef bad_objc_extensions
+    $(call __ndk_info,WARNING: Invalid LOCAL_OBJC_EXTENSION values: $(bad_objc_extensions))
+    LOCAL_OBJC_EXTENSION := $(filter $(bad_objc_extensions),$(LOCAL_OBJC_EXTENSION))
+endif
+LOCAL_OBJC_EXTENSION := $(strip $(LOCAL_OBJC_EXTENSION))
+ifeq ($(LOCAL_OBJC_EXTENSION),)
+    LOCAL_OBJC_EXTENSION := .m
+endif
+
+#
+# Check LOCAL_OBJCPP_EXTENSION, use '.mm' by default
+#
+bad_objcpp_extensions := $(strip $(filter-out .%,$(LOCAL_OBJCPP_EXTENSION)))
+ifdef bad_objcpp_extensions
+    $(call __ndk_info,WARNING: Invalid LOCAL_OBJCPP_EXTENSION values: $(bad_objcpp_extensions))
+    LOCAL_OBJCPP_EXTENSION := $(filter $(bad_objcpp_extensions),$(LOCAL_OBJCPP_EXTENSION))
+endif
+LOCAL_OBJCPP_EXTENSION := $(strip $(LOCAL_OBJCPP_EXTENSION))
+ifeq ($(LOCAL_OBJCPP_EXTENSION),)
+    LOCAL_OBJCPP_EXTENSION := .mm
+endif
+
+#
+# If LOCAL_ALLOW_UNDEFINED_SYMBOLS is not true, the linker will allow the generation
+# of a binary that uses undefined symbols.
+#
+ifneq ($(LOCAL_ALLOW_UNDEFINED_SYMBOLS),true)
+  LOCAL_LDFLAGS += $($(my)NO_UNDEFINED_LDFLAGS)
+endif
+
+# Toolchain by default disallows generated code running from the heap and stack.
+# If LOCAL_DISABLE_NO_EXECUTE is true, we allow that
+#
+ifeq ($(LOCAL_DISABLE_NO_EXECUTE),true)
+  LOCAL_CFLAGS += $($(my)DISABLE_NO_EXECUTE_CFLAGS)
+  LOCAL_LDFLAGS += $($(my)DISABLE_NO_EXECUTE_LDFLAGS)
+else
+  LOCAL_CFLAGS += $($(my)NO_EXECUTE_CFLAGS)
+  LOCAL_LDFLAGS += $($(my)NO_EXECUTE_LDFLAGS)
+endif
+
+# Toolchain by default provides relro and GOT protections.
+# If LOCAL_DISABLE_RELRO is true, we disable the protections.
+#
+ifeq ($(LOCAL_DISABLE_RELRO),true)
+  LOCAL_LDFLAGS += $($(my)DISABLE_RELRO_LDFLAGS)
+else
+  LOCAL_LDFLAGS += $($(my)RELRO_LDFLAGS)
+endif
+
+# By default, we protect against format string vulnerabilities
+# If LOCAL_DISABLE_FORMAT_STRING_CHECKS is true, we disable the protections.
+ifeq ($(LOCAL_DISABLE_FORMAT_STRING_CHECKS),true)
+  LOCAL_CFLAGS += $($(my)DISABLE_FORMAT_STRING_CFLAGS)
+else
+  LOCAL_CFLAGS += $($(my)FORMAT_STRING_CFLAGS)
+endif
+
+# enable PIE for executable beyond certain API level, unless "-static"
+ifneq (,$(filter true,$(NDK_APP_PIE) $(TARGET_PIE)))
+  ifeq ($(call module-get-class,$(LOCAL_MODULE)),EXECUTABLE)
+    ifeq (,$(filter -static,$(TARGET_LDFLAGS) $(LOCAL_LDFLAGS) $(NDK_APP_LDFLAGS)))
+      LOCAL_CFLAGS += -fPIE
+      LOCAL_LDFLAGS += -fPIE -pie
+    endif
+  endif
+endif
+
+#
+# The original Android build system allows you to use the .arm prefix
+# to a source file name to indicate that it should be defined in either
+# 'thumb' or 'arm' mode, depending on the value of LOCAL_ARM_MODE
+#
+# First, check LOCAL_ARM_MODE, it should be empty, 'thumb' or 'arm'
+# We make the default 'thumb'
+#
+LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))
+ifdef LOCAL_ARM_MODE
+  ifneq ($(words $(LOCAL_ARM_MODE)),1)
+      $(call __ndk_info,   LOCAL_ARM_MODE in $(LOCAL_MAKEFILE) must be one word, not '$(LOCAL_ARM_MODE)')
+      $(call __ndk_error, Aborting)
+  endif
+  # check that LOCAL_ARM_MODE is defined to either 'arm' or 'thumb'
+  $(if $(filter-out thumb arm, $(LOCAL_ARM_MODE)),\
+      $(call __ndk_info,   LOCAL_ARM_MODE must be defined to either 'arm' or 'thumb' in $(LOCAL_MAKEFILE) not '$(LOCAL_ARM_MODE)')\
+      $(call __ndk_error, Aborting)\
+  )
+endif
+
+# As a special case, the original Android build system
+# allows one to specify that certain source files can be
+# forced to build in ARM mode by using a '.arm' suffix
+# after the extension, e.g.
+#
+#  LOCAL_SRC_FILES := foo.c.arm
+#
+# to build source file $(LOCAL_PATH)/foo.c as ARM
+#
+
+$(call clear-all-src-tags)
+
+# As a special extension, the NDK also supports the .neon extension suffix
+# to indicate that a single file can be compiled with ARM NEON support
+# We must support both foo.c.neon and foo.c.arm.neon here
+#
+# Also, if LOCAL_ARM_NEON is set to 'true', force Neon mode for all source
+# files
+#
+
+neon_sources  := $(filter %.neon,$(LOCAL_SRC_FILES))
+neon_sources  := $(neon_sources:%.neon=%)
+
+LOCAL_ARM_NEON := $(strip $(LOCAL_ARM_NEON))
+ifdef LOCAL_ARM_NEON
+  $(if $(filter-out true false,$(LOCAL_ARM_NEON)),\
+    $(call __ndk_info,LOCAL_ARM_NEON must be defined either to 'true' or 'false' in $(LOCAL_MAKEFILE), not '$(LOCAL_ARM_NEON)')\
+    $(call __ndk_error,Aborting) \
+  )
+endif
+ifeq ($(LOCAL_ARM_NEON),true)
+  neon_sources += $(LOCAL_SRC_FILES:%.neon=%)
+  # tag the precompiled header with 'neon' tag if it exists
+  ifneq (,$(LOCAL_PCH))
+    $(call tag-src-files,$(LOCAL_PCH),neon)
+  endif
+endif
+
+neon_sources := $(strip $(neon_sources))
+ifdef neon_sources
+  ifeq ($(filter $(TARGET_ARCH_ABI), armeabi-v7a armeabi-v7a-hard arm64-v8a x86 x86_64),)
+    $(call __ndk_info,NEON support is only possible for armeabi-v7a ABI, its variant armeabi-v7a-hard, and arm64-v8a, x86 and x86_64 ABIs)
+    $(call __ndk_info,Please add checks against TARGET_ARCH_ABI in $(LOCAL_MAKEFILE))
+    $(call __ndk_error,Aborting)
+  endif
+  $(call tag-src-files,$(neon_sources:%.arm=%),neon)
+endif
+
+LOCAL_SRC_FILES := $(LOCAL_SRC_FILES:%.neon=%)
+
+# strip the .arm suffix from LOCAL_SRC_FILES
+# and tag the relevant sources with the 'arm' tag
+#
+arm_sources     := $(filter %.arm,$(LOCAL_SRC_FILES))
+arm_sources     := $(arm_sources:%.arm=%)
+thumb_sources   := $(filter-out %.arm,$(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(LOCAL_SRC_FILES:%.arm=%)
+
+ifeq ($(LOCAL_ARM_MODE),arm)
+    arm_sources := $(LOCAL_SRC_FILES)
+    # tag the precompiled header with 'arm' tag if it exists
+    ifneq (,$(LOCAL_PCH))
+        $(call tag-src-files,$(LOCAL_PCH),arm)
+    endif
+else
+# For arm, all sources are compiled in thumb mode by default in release mode.
+# Linker should behave similarly
+ifneq ($(filter armeabi%, $(TARGET_ARCH_ABI)),)
+ifneq ($(APP_OPTIM),debug)
+    LOCAL_LDFLAGS += -mthumb
+endif
+endif
+endif
+ifeq ($(LOCAL_ARM_MODE),thumb)
+    arm_sources := $(empty)
+endif
+$(call tag-src-files,$(arm_sources),arm)
+
+# tag debug if APP_OPTIM is 'debug'
+#
+ifeq ($(APP_OPTIM),debug)
+    $(call tag-src-files,$(LOCAL_SRC_FILES),debug)
+    ifneq (,$(LOCAL_PCH))
+        $(call tag-src-files,$(LOCAL_PCH),debug)
+    endif
+endif
+
+# add PCH to LOCAL_SRC_FILES so that TARGET-process-src-files-tags could process it
+ifneq (,$(LOCAL_PCH))
+    LOCAL_SRC_FILES += $(LOCAL_PCH)
+endif
+
+# Process all source file tags to determine toolchain-specific
+# target compiler flags, and text.
+#
+$(call TARGET-process-src-files-tags)
+
+# now remove PCH from LOCAL_SRC_FILES to prevent getting NDK warning about
+# unsupported source file extensions
+ifneq (,$(LOCAL_PCH))
+    LOCAL_SRC_FILES := $(filter-out $(LOCAL_PCH),$(LOCAL_SRC_FILES))
+endif
+
+# only call dump-src-file-tags during debugging
+#$(dump-src-file-tags)
+
+LOCAL_DEPENDENCY_DIRS :=
+
+# all_source_patterns contains the list of filename patterns that correspond
+# to source files recognized by our build system
+ifneq ($(filter x86 x86_64, $(TARGET_ARCH_ABI)),)
+all_source_extensions := .c .s .S .asm $(LOCAL_CPP_EXTENSION) $(LOCAL_RS_EXTENSION) $(LOCAL_OBJC_EXTENSION) $(LOCAL_OBJCPP_EXTENSION)
+else
+all_source_extensions := .c .s .S $(LOCAL_CPP_EXTENSION) $(LOCAL_RS_EXTENSION) $(LOCAL_OBJC_EXTENSION) $(LOCAL_OBJCPP_EXTENSION)
+endif
+all_source_patterns   := $(foreach _ext,$(all_source_extensions),%$(_ext))
+all_cpp_patterns      := $(foreach _ext,$(LOCAL_CPP_EXTENSION),%$(_ext))
+all_rs_patterns       := $(foreach _ext,$(LOCAL_RS_EXTENSION),%$(_ext))
+all_objc_patterns     := $(foreach _ext,$(LOCAL_OBJC_EXTENSION),%$(_ext))
+all_objcpp_patterns   := $(foreach _ext,$(LOCAL_OBJCPP_EXTENSION),%$(_ext))
+
+unknown_sources := $(strip $(filter-out $(all_source_patterns),$(LOCAL_SRC_FILES)))
+ifdef unknown_sources
+    $(call __ndk_info,WARNING: Unsupported source file extensions in $(LOCAL_MAKEFILE) for module $(LOCAL_MODULE))
+    $(call __ndk_info,  $(unknown_sources))
+endif
+
+# LOCAL_OBJECTS will list all object files corresponding to the sources
+# listed in LOCAL_SRC_FILES, in the *same* order.
+#
+LOCAL_OBJECTS := $(LOCAL_SRC_FILES)
+$(foreach _ext,$(all_source_extensions),\
+    $(eval LOCAL_OBJECTS := $$(LOCAL_OBJECTS:%$(_ext)=%$$(TARGET_OBJ_EXTENSION)))\
+)
+LOCAL_OBJECTS := $(filter %$(TARGET_OBJ_EXTENSION),$(LOCAL_OBJECTS))
+LOCAL_OBJECTS := $(subst ../,__/,$(LOCAL_OBJECTS))
+LOCAL_OBJECTS := $(subst :,_,$(LOCAL_OBJECTS))
+LOCAL_OBJECTS := $(foreach _obj,$(LOCAL_OBJECTS),$(LOCAL_OBJS_DIR)/$(_obj))
+
+LOCAL_RS_OBJECTS := $(filter $(all_rs_patterns),$(LOCAL_SRC_FILES))
+$(foreach _ext,$(LOCAL_RS_EXTENSION),\
+    $(eval LOCAL_RS_OBJECTS := $$(LOCAL_RS_OBJECTS:%$(_ext)=%$$(TARGET_OBJ_EXTENSION)))\
+)
+LOCAL_RS_OBJECTS := $(filter %$(TARGET_OBJ_EXTENSION),$(LOCAL_RS_OBJECTS))
+LOCAL_RS_OBJECTS := $(subst ../,__/,$(LOCAL_RS_OBJECTS))
+LOCAL_RS_OBJECTS := $(subst :,_,$(LOCAL_RS_OBJECTS))
+LOCAL_RS_OBJECTS := $(foreach _obj,$(LOCAL_RS_OBJECTS),$(LOCAL_OBJS_DIR)/$(_obj))
+
+ifneq (,$(call module-has-objc-sources,$(LOCAL_MODULE)))
+    objc_cflags  :=
+    objc_ldflags :=
+    #objc_cflags  += objc-exception
+    ifneq (,$(filter clang%,$(NDK_TOOLCHAIN_VERSION)))
+        objc_cflags += objc-arc
+        objc_ldflags += objc-arc
+    endif
+    $(foreach __f,$(objc_cflags),\
+        $(eval LOCAL_OBJCFLAGS += $(if $(filter -f$(__f) -fno-$(__f),$(foreach __t,TARGET LOCAL NDK_APP,$(foreach __l,C OBJC,$($(__t)_$(__l)FLAGS)))),,-f$(__f)))\
+    )
+    $(foreach __f,$(objc_ldflags),\
+        $(eval LOCAL_LDFLAGS += $(if $(filter -f$(__f) -fno-$(__f),$(foreach __t,TARGET LOCAL NDK_APP,$($(__t)_LDFLAGS))),,-f$(__f)))\
+    )
+endif
+
+# If the module has any kind of C++ features, enable them in LOCAL_CPPFLAGS
+#
+ifneq (,$(call module-has-c++-features,$(LOCAL_MODULE),rtti))
+    LOCAL_CPPFLAGS += -frtti
+endif
+ifneq (,$(call module-has-c++-features,$(LOCAL_MODULE),exceptions))
+    LOCAL_CPPFLAGS += -fexceptions
+endif
+
+ifeq ($(filter -std=%,$(LOCAL_CFLAGS) $(LOCAL_CPPFLAGS)),)
+ifneq ($(TARGET_CXX_STANDARD),)
+LOCAL_CPPFLAGS += -std=$(TARGET_CXX_STANDARD)
+endif
+endif
+
+# If we're using the 'system' STL and use rtti or exceptions, then
+# automatically link against the GNU libsupc++ for now.
+#
+ifneq (,$(call module-has-c++-features,$(LOCAL_MODULE),rtti exceptions))
+    ifeq (system,$(NDK_APP_STL))
+      LOCAL_LDLIBS := $(LOCAL_LDLIBS) $(call host-path,$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(TOOLCHAIN_VERSION)/libs/$(TARGET_ARCH_ABI)/libsupc++$(TARGET_LIB_EXTENSION))
+    endif
+endif
+
+# Set include patch for renderscript
+
+
+ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),)
+    LOCAL_RENDERSCRIPT_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE)
+else
+    LOCAL_RENDERSCRIPT_INCLUDES := \
+        $(RENDERSCRIPT_TOOLCHAIN_HEADER) \
+        $(TARGET_C_INCLUDES)/rs/scriptc \
+        $(LOCAL_RENDERSCRIPT_INCLUDES)
+endif
+
+RS_COMPAT :=
+ifneq ($(call module-is-shared-library,$(LOCAL_MODULE)),)
+    RS_COMPAT := true
+endif
+
+
+# Build PCH
+
+get-pch-name = $(strip \
+    $(subst ../,__/,\
+        $(eval __pch := $1)\
+        $(eval __pch := $(__pch:%.h=%.precompiled.h))\
+        $(__pch)\
+    ))
+
+ifneq (,$(LOCAL_PCH))
+    # Build PCH into obj directory
+    LOCAL_BUILT_PCH := $(call get-pch-name,$(LOCAL_PCH))
+
+    # Build PCH
+    $(call compile-cpp-source,$(LOCAL_PCH),$(LOCAL_BUILT_PCH).gch)
+
+    # All obj files are dependent on the PCH
+    $(foreach src,$(filter $(all_cpp_patterns),$(LOCAL_SRC_FILES)),\
+        $(eval $(LOCAL_OBJS_DIR)/$(call get-object-name,$(src)) : $(LOCAL_OBJS_DIR)/$(LOCAL_BUILT_PCH).gch)\
+    )
+
+    # Files from now on build with PCH
+    LOCAL_CPPFLAGS += -Winvalid-pch -include $(LOCAL_OBJS_DIR)/$(LOCAL_BUILT_PCH)
+
+    # Insert PCH dir at beginning of include search path
+    LOCAL_C_INCLUDES := \
+        $(LOCAL_OBJS_DIR) \
+        $(LOCAL_C_INCLUDES)
+endif
+
+# Build the sources to object files
+#
+
+$(foreach src,$(filter %.c,$(LOCAL_SRC_FILES)), $(call compile-c-source,$(src),$(call get-object-name,$(src))))
+$(foreach src,$(filter %.S %.s,$(LOCAL_SRC_FILES)), $(call compile-s-source,$(src),$(call get-object-name,$(src))))
+$(foreach src,$(filter $(all_objc_patterns),$(LOCAL_SRC_FILES)),\
+    $(call compile-objc-source,$(src),$(call get-object-name,$(src)))\
+)
+$(foreach src,$(filter $(all_objcpp_patterns),$(LOCAL_SRC_FILES)),\
+    $(call compile-objc++-source,$(src),$(call get-object-name,$(src)))\
+)
+$(foreach src,$(filter $(all_cpp_patterns),$(LOCAL_SRC_FILES)),\
+    $(call compile-cpp-source,$(src),$(call get-object-name,$(src)))\
+)
+
+$(foreach src,$(filter $(all_rs_patterns),$(LOCAL_SRC_FILES)),\
+    $(call compile-rs-source,$(src),$(call get-rs-scriptc-name,$(src)),$(call get-rs-bc-name,$(src)),$(call get-rs-so-name,$(src)),$(call get-object-name,$(src)),$(RS_COMPAT))\
+)
+
+ifneq ($(filter x86 x86_64, $(TARGET_ARCH_ABI)),)
+$(foreach src,$(filter %.asm,$(LOCAL_SRC_FILES)), $(call compile-asm-source,$(src),$(call get-object-name,$(src))))
+endif
+
+#
+# The compile-xxx-source calls updated LOCAL_OBJECTS and LOCAL_DEPENDENCY_DIRS
+#
+ALL_DEPENDENCY_DIRS += $(sort $(LOCAL_DEPENDENCY_DIRS))
+CLEAN_OBJS_DIRS     += $(LOCAL_OBJS_DIR)
+
+#
+# Handle the static and shared libraries this module depends on
+#
+
+# If LOCAL_LDLIBS contains anything like -l<library> then
+# prepend a -L$(SYSROOT_LINK)/usr/lib to it to ensure that the linker
+# looks in the right location
+#
+ifneq ($(filter -l%,$(LOCAL_LDLIBS)),)
+    LOCAL_LDLIBS := -L$(call host-path,$(SYSROOT_LINK)/usr/lib) $(LOCAL_LDLIBS)
+    ifneq ($(filter x86_64 mips64,$(TARGET_ARCH_ABI)),)
+        LOCAL_LDLIBS := -L$(call host-path,$(SYSROOT_LINK)/usr/lib64) $(LOCAL_LDLIBS)
+    endif
+endif
+
+# When LOCAL_SHORT_COMMANDS is defined to 'true' we are going to write the
+# list of all object files and/or static/shared libraries that appear on the
+# command line to a file, then use the @<listfile> syntax to invoke it.
+#
+# This allows us to link or archive a huge number of stuff even on Windows
+# with its puny 8192 max character limit on its command-line.
+#
+LOCAL_SHORT_COMMANDS := $(strip $(LOCAL_SHORT_COMMANDS))
+ifndef LOCAL_SHORT_COMMANDS
+    LOCAL_SHORT_COMMANDS := $(strip $(NDK_APP_SHORT_COMMANDS))
+endif
+
+define libcrystax-link-type
+$(strip \
+    $(call assert-defined,LOCAL_LDFLAGS NDK_APP_LIBCRYSTAX)\
+    $(if \
+        $(or \
+            $(filter -static,$(LOCAL_LDFLAGS)),\
+            $(filter static,$(NDK_APP_LIBCRYSTAX))\
+        ),\
+        static,\
+        dynamic\
+    )\
+)
+endef
+
+# $1: Target ABI
+define libcrystax-libpath
+$(strip \
+    $(eval __libcrystax_libpath := $(crystax-dir)/libs/$(1)$(if $(filter armeabi%,$(1)),/thumb))\
+    $(if $(wildcard $(__libcrystax_libpath)),\
+        $(__libcrystax_libpath),\
+        $(call __ndk_info,Could not find libcrystax libraries: $(call pretty-dir,$(__libcrystax_libpath)) (broken NDK?))\
+        $(call __ndk_error,Aborting)\
+    )\
+)
+endef
+
+# - Ensure -lcrystax is _always_ before -lc
+# - Properly detect how to link libcrystax - statically or dynamically
+# - Specify path to empty libcrystax.a stub to make linker happy when it
+#   use -lcrystax (according to built-in linker spec)
+# - Specify proper path to libcrystax binary
+# - Force __crystax_on_load/__crystax_on_unload to be undefined in case of static
+#   libcrystax linking. This way we ensure they will not be thrown away by linker.
+# - Enable 'muldefs' option when statically linking.
+#   This way app will use functions from libcrystax and link successfully
+#   even if there are symbols with the same name in subsequent static libraries (libc etc)
+# - Force -Wl,--eh-frame-hdr for static executables if not yet specified
+# Parameters:
+# $1: List of linker '-lxxx' options to adjust
+define interpose-libcrystax
+$(strip \
+    $(call assert-defined,TARGET_ARCH_ABI LOCAL_LDFLAGS)\
+    $(filter-out -lc -lm,$(1)) \
+    $(if $(filter static,$(libcrystax-link-type)),\
+        -u __crystax_on_load \
+        -u __crystax_on_unload \
+    ) \
+    $(if $(filter -static,$(LOCAL_LDFLAGS)),\
+        $(eval __libcrystax_muldefs := -Wl,-z,muldefs) \
+        $(__libcrystax_muldefs) \
+    ) \
+    $(if $(filter -static,$(LOCAL_LDFLAGS)),\
+        $(eval __libcrystax_static_eh_frame_hdr := -Wl,--eh-frame-hdr) \
+        $(if $(filter $(__libcrystax_static_eh_frame_hdr),$(LOCAL_LDFLAGS)),,$(__libcrystax_static_eh_frame_hdr)) \
+    ) \
+    -L$(crystax-dir)/empty \
+    $(call libcrystax-libpath,$(TARGET_ARCH_ABI))/libcrystax.$(if $(filter static,$(libcrystax-link-type)),a,so) \
+    -lc \
+)
+endef
+
+$(call generate-file-dir,$(LOCAL_BUILT_MODULE))
+
+$(LOCAL_BUILT_MODULE): PRIVATE_OBJECTS := $(LOCAL_OBJECTS)
+$(LOCAL_BUILT_MODULE): PRIVATE_LIBGCC := $(TARGET_LIBGCC)
+
+$(LOCAL_BUILT_MODULE): PRIVATE_LD := $(TARGET_LD)
+$(LOCAL_BUILT_MODULE): PRIVATE_LDFLAGS := $(TARGET_LDFLAGS) $(LOCAL_LDFLAGS) $(NDK_APP_LDFLAGS)
+$(LOCAL_BUILT_MODULE): PRIVATE_LDLIBS  := $(call interpose-libcrystax,$(LOCAL_LDLIBS) $(TARGET_LDLIBS))
+
+$(LOCAL_BUILT_MODULE): PRIVATE_NAME := $(notdir $(LOCAL_BUILT_MODULE))
+$(LOCAL_BUILT_MODULE): PRIVATE_CXX := $(TARGET_CXX)
+$(LOCAL_BUILT_MODULE): PRIVATE_CC := $(TARGET_CC)
+$(LOCAL_BUILT_MODULE): PRIVATE_SYSROOT_LINK := $(SYSROOT_LINK)
+
+ifeq ($(call module-get-class,$(LOCAL_MODULE)),STATIC_LIBRARY)
+
+#
+# This is a static library module, things are very easy. We only need
+# to build the object files and archive them with 'ar'. Note that module
+# dependencies can be ignored here, i.e. if the module depends on other
+# static or shared libraries, there is no need to actually build them
+# before, so don't add Make dependencies to them.
+#
+# In other words, consider the following graph:
+#
+#     libfoo.so -> libA.a ->libB.a
+#
+# then libA.a and libB.a can be built in parallel, only linking libfoo.so
+# depends on their completion.
+#
+
+ar_objects := $(call host-path,$(LOCAL_OBJECTS))
+
+ifeq ($(LOCAL_SHORT_COMMANDS),true)
+    $(call ndk_log,Building static library module '$(LOCAL_MODULE)' with linker list file)
+    ar_list_file := $(LOCAL_OBJS_DIR)/archiver.list
+    $(call generate-list-file,$(ar_objects),$(ar_list_file))
+    ar_objects   := @$(call host-path,$(ar_list_file))
+    $(LOCAL_BUILT_MODULE): $(ar_list_file)
+endif
+
+# Compute 'ar' flags. Thin archives simply require 'T' here.
+ar_flags := $(TARGET_ARFLAGS)
+ifeq (true,$(thin_archive))
+    $(call ndk_log,$(TARGET_ARCH_ABI):Building static library '$(LOCAL_MODULE)' as thin archive)
+    ar_flags := $(ar_flags)T
+endif
+
+$(LOCAL_BUILT_MODULE): PRIVATE_ABI := $(TARGET_ARCH_ABI)
+$(LOCAL_BUILT_MODULE): PRIVATE_AR := $(TARGET_AR) $(ar_flags)
+$(LOCAL_BUILT_MODULE): PRIVATE_AR_OBJECTS := $(ar_objects)
+$(LOCAL_BUILT_MODULE): PRIVATE_BUILD_STATIC_LIB := $(cmd-build-static-library)
+
+$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
+	$(call host-echo-build-step,$(PRIVATE_ABI),StaticLibrary) "$(PRIVATE_NAME)"
+#	$(hide) $(call host-rm,$@)
+	$(hide) $(PRIVATE_BUILD_STATIC_LIB)
+
+ALL_STATIC_LIBRARIES += $(LOCAL_BUILT_MODULE)
+
+endif
+
+ifneq (,$(filter SHARED_LIBRARY EXECUTABLE,$(call module-get-class,$(LOCAL_MODULE))))
+
+#
+# This is a shared library or an executable, so computing dependencies properly is
+# crucial. The general rule to apply is the following:
+#
+#   - collect the list of all static libraries that need to be part
+#     of the link, and in the right order. To do so, get the transitive
+#     closure of LOCAL_STATIC_LIBRARIES and LOCAL_WHOLE_STATIC_LIBRARIES
+#     and ensure they are ordered topologically.
+#
+#  - collect the list of all shared libraries that need to be part of
+#    the link. This is the transitive closure of the list of
+#    LOCAL_SHARED_LIBRARIES for the module and all its dependent static
+#    libraries identified in the step above. Of course, need to be
+#    ordered topologically too.
+#
+#  - add Make dependencies to ensure that all these libs are built
+#    before the module itself too.
+#
+# A few quick examples:
+#
+#    main.exe -> libA.a -> libB.a -> libfoo.so -> libC.a
+#
+#      static_libs(main.exe) = libA.a libB.a  (i.e. no libC.a)
+#      shared_libs(main.exe) = libfoo.so
+#      static_libs(libfoo.so) = libC.a
+#
+#    main.exe -> libA.a ---> libB.a
+#                  |           ^
+#                  v           |
+#                libC.a  ------
+#
+#      static_libs(main.exe) = libA.a libC.a libB.a
+#             (i.e. libB.a must appear after all libraries that depend on it).
+#
+all_libs := $(call module-get-link-libs,$(LOCAL_MODULE))
+shared_libs := $(call module-filter-shared-libraries,$(all_libs))
+static_libs := $(call module-filter-static-libraries,$(all_libs))
+whole_static_libs := $(call module-extract-whole-static-libs,$(LOCAL_MODULE),$(static_libs))
+static_libs := $(filter-out $(whole_static_libs),$(static_libs))
+
+$(call -ndk-mod-debug,module $(LOCAL_MODULE) [$(LOCAL_BUILT_MODULE)])
+$(call -ndk-mod-debug,.  all_libs='$(all_libs)')
+$(call -ndk-mod-debug,.  shared_libs='$(shared_libs)')
+$(call -ndk-mod-debug,.  static_libs='$(static_libs)')
+$(call -ndk-mod-debug,.  whole_static_libs='$(whole_static_libs)')
+
+shared_libs       := $(call map,module-get-built,$(shared_libs))\
+                     $(TARGET_PREBUILT_SHARED_LIBRARIES)
+static_libs       := $(call map,module-get-built,$(static_libs))
+whole_static_libs := $(call map,module-get-built,$(whole_static_libs))
+
+$(call -ndk-mod-debug,.  built_shared_libs='$(shared_libs)')
+$(call -ndk-mod-debug,.  built_static_libs='$(static_libs)')
+$(call -ndk-mod-debug,.  built_whole_static_libs='$(whole_static_libs)')
+
+# The list of object/static/shared libraries passed to the linker when
+# building shared libraries and executables. order is important.
+#
+# Cannot use immediate evaluation because PRIVATE_LIBGCC may not be defined at this point.
+linker_objects_and_libraries = $(strip $(call TARGET-get-linker-objects-and-libraries,\
+    $(LOCAL_OBJECTS), \
+    $(static_libs), \
+    $(whole_static_libs), \
+    $(shared_libs)))
+
+ifeq ($(LOCAL_SHORT_COMMANDS),true)
+    $(call ndk_log,Building ELF binary module '$(LOCAL_MODULE)' with linker list file)
+    linker_options   := $(linker_objects_and_libraries)
+    linker_list_file := $(LOCAL_OBJS_DIR)/linker.list
+    linker_objects_and_libraries := @$(call host-path,$(linker_list_file))
+    $(call generate-list-file,$(linker_options),$(linker_list_file))
+    $(LOCAL_BUILT_MODULE): $(linker_list_file)
+endif
+
+$(LOCAL_BUILT_MODULE): $(shared_libs) $(static_libs) $(whole_static_libs)
+$(LOCAL_BUILT_MODULE): PRIVATE_ABI := $(TARGET_ARCH_ABI)
+$(LOCAL_BUILT_MODULE): PRIVATE_LINKER_OBJECTS_AND_LIBRARIES := $(linker_objects_and_libraries)
+$(LOCAL_BUILT_MODULE): PRIVATE_STATIC_LIBRARIES := $(static_libs)
+$(LOCAL_BUILT_MODULE): PRIVATE_WHOLE_STATIC_LIBRARIES := $(whole_static_libs)
+$(LOCAL_BUILT_MODULE): PRIVATE_SHARED_LIBRARIES := $(shared_libs)
+
+endif
+
+#
+# If this is a shared library module
+#
+ifeq ($(call module-get-class,$(LOCAL_MODULE)),SHARED_LIBRARY)
+$(LOCAL_BUILT_MODULE): PRIVATE_BUILD_SHARED_LIB := $(cmd-build-shared-library)
+$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
+	$(call host-echo-build-step,$(PRIVATE_ABI),SharedLibrary) "$(PRIVATE_NAME)"
+	$(hide) $(PRIVATE_BUILD_SHARED_LIB)
+
+ALL_SHARED_LIBRARIES += $(LOCAL_BUILT_MODULE)
+endif
+
+#
+# If this is an executable module
+#
+ifeq ($(call module-get-class,$(LOCAL_MODULE)),EXECUTABLE)
+$(LOCAL_BUILT_MODULE): PRIVATE_ABI := $(TARGET_ARCH_ABI)
+$(LOCAL_BUILT_MODULE): PRIVATE_BUILD_EXECUTABLE := $(cmd-build-executable)
+$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
+	$(call host-echo-build-step,$(PRIVATE_ABI),Executable) "$(PRIVATE_NAME)"
+	$(hide) $(PRIVATE_BUILD_EXECUTABLE)
+
+ALL_EXECUTABLES += $(LOCAL_BUILT_MODULE)
+endif
+
+#
+# If this is a copyable prebuilt module
+#
+ifeq ($(call module-is-copyable,$(LOCAL_MODULE)),$(true))
+$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
+	$(call host-echo-build-step,$(PRIVATE_ABI),Prebuilt) "$(PRIVATE_NAME) <= $(call pretty-dir,$(dir $<))"
+	$(hide) $(call host-cp,$<,$@)
+endif
+
+#
+# If this is an installable module
+#
+ifeq ($(call module-is-installable,$(LOCAL_MODULE)),$(true))
+$(LOCAL_INSTALLED): PRIVATE_ABI         := $(TARGET_ARCH_ABI)
+$(LOCAL_INSTALLED): PRIVATE_NAME        := $(notdir $(LOCAL_BUILT_MODULE))
+$(LOCAL_INSTALLED): PRIVATE_SRC         := $(LOCAL_BUILT_MODULE)
+$(LOCAL_INSTALLED): PRIVATE_DST_DIR     := $(NDK_APP_DST_DIR)
+$(LOCAL_INSTALLED): PRIVATE_DST         := $(LOCAL_INSTALLED)
+$(LOCAL_INSTALLED): PRIVATE_STRIP       := $(TARGET_STRIP)
+$(LOCAL_INSTALLED): PRIVATE_STRIP_CMD   := $(call cmd-strip, $(PRIVATE_DST))
+$(LOCAL_INSTALLED): PRIVATE_OBJCOPY     := $(TARGET_OBJCOPY)
+$(LOCAL_INSTALLED): PRIVATE_OBJCOPY_CMD := $(call cmd-add-gnu-debuglink, $(PRIVATE_DST), $(PRIVATE_SRC))
+
+LIBCRYSTAX_INSTALLED := $(subst //,/,$(call parent-dir,$(LOCAL_INSTALLED))/libcrystax.so)
+
+$(LOCAL_INSTALLED): $(LOCAL_BUILT_MODULE) clean-installed-binaries $(if $(filter dynamic,$(libcrystax-link-type)),$(LIBCRYSTAX_INSTALLED))
+	$(call host-echo-build-step,$(PRIVATE_ABI),Install) "$(PRIVATE_NAME) => $(call pretty-dir,$(PRIVATE_DST))"
+	$(hide) $(call host-install,$(PRIVATE_SRC),$(PRIVATE_DST))
+	$(hide) $(PRIVATE_STRIP_CMD)
+
+#$(hide) $(PRIVATE_OBJCOPY_CMD)
+
+$(call generate-file-dir,$(LOCAL_INSTALLED))
+
+ifeq (,$(GLOBAL_LIBCRYSTAX_INSTALL_RULE_DEFINED.$(TARGET_ARCH_ABI)))
+
+$(LIBCRYSTAX_INSTALLED): PRIVATE_LIBCRYSTAX_ABI := $(TARGET_ARCH_ABI)
+
+$(LIBCRYSTAX_INSTALLED): $(LOCAL_BUILT_MODULE) clean-installed-binaries
+	$(call host-echo-build-step,$(PRIVATE_LIBCRYSTAX_ABI),Install) "$(notdir $@) => $(call pretty-dir,$@)"
+	$(hide) $(call host-install,$(call libcrystax-libpath,$(PRIVATE_LIBCRYSTAX_ABI))/libcrystax.so,$@)
+	$(hide) $(call cmd-strip,$@)
+
+$(call generate-file-dir,$(LIBCRYSTAX_INSTALLED))
+
+GLOBAL_LIBCRYSTAX_INSTALL_RULE_DEFINED.$(TARGET_ARCH_ABI) := true
+
+endif
+
+endif

scripts/build-target-python.sh

@@ -276,6 +276,9 @@ build_python_for_abi ()
         armeabi-v7a-hard)
             CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mhard-float"
             ;;
+        arm64-v8a)
+            CFLAGS="-march=armv8-a"
+            ;;
         *)
             CFLAGS=""
     esac
@@ -285,7 +288,7 @@ build_python_for_abi ()
             CFLAGS="$CFLAGS -mthumb"
     esac
 
-    local CFLAGS="$CFLAGS --sysroot=$NDK_DIR/platforms/android-$APILEVEL/arch-$ARCH"
+    local CFLAGS="$CFLAGS -O3 -pipe --sysroot=$NDK_DIR/platforms/android-$APILEVEL/arch-$ARCH"
 
     local LDFLAGS=""
     if [ "$ABI" = "armeabi-v7a-hard" ]; then
@@ -306,11 +309,12 @@ build_python_for_abi ()
 
     local CONFIG_SITE=$BUILDDIR_CONFIG/config.site
     {
-        echo 'ac_cv_file__dev_ptmx=no'
+        echo 'ac_cv_file__dev_ptmx=yes'
         echo 'ac_cv_file__dev_ptc=no'
         echo 'ac_cv_func_gethostbyname_r=no'
         if [ "$PYTHON_MAJOR_VERSION" == "3" ]; then
             echo 'ac_cv_func_faccessat=no'
+            echo 'ac_cv_little_endian_double=yes'
         fi
     } >$CONFIG_SITE
     fail_panic "Can't create config.site wrapper"
@@ -346,15 +350,17 @@ build_python_for_abi ()
             echo "    --host=$HOST \\"
             echo "    --build=$BUILD_ON_PLATFORM \\"
             echo "    --prefix=$BUILDDIR_CONFIG/install \\"
+            echo "    --exec-prefix=/usr/local \\"
+            echo "    --enable-loadable-sqlite-extensions \\"
             echo "    --enable-shared \\"
-            echo "    --with-threads \\"
             echo "    --enable-ipv6 \\"
+            echo "    --enable-optimizations \\"
             echo "    --with-computed-gotos \\"
+            echo "    --with-lto \\"
+            echo "    --without-ensurepip \\"
             echo "    ac_cv_file__dev_ptmx=yes \\"
             echo "    ac_cv_file__dev_ptc=no \\"
-            echo "    --without-ensurepip \\"
+            echo "    ac_cv_little_endian_double=yes"
-            echo "    ac_cv_little_endian_double=yes \\"
-            echo "    --exec-prefix=/usr/local"
         fi
     } >$CONFIGURE_WRAPPER
     fail_panic "Can't create configure wrapper"
@@ -648,6 +654,7 @@ build_python_for_abi ()
         echo 'include $(CLEAR_VARS)'
         echo 'LOCAL_MODULE := _queue'
         echo "MY_PYTHON_SRC_ROOT := $PYTHON_SRCDIR"
+        echo 'LOCAL_CFLAGS := -DPy_BUILD_CORE'
         echo 'LOCAL_SRC_FILES := \'
         echo '  $(MY_PYTHON_SRC_ROOT)/Modules/_queuemodule.c'
         echo 'LOCAL_C_INCLUDES := $(MY_PYTHON_SRC_ROOT)/Include/internal'
@@ -949,7 +956,9 @@ build_python_for_abi ()
         echo 'LOCAL_PATH := $(call my-dir)'
         echo 'include $(CLEAR_VARS)'
         echo 'LOCAL_MODULE := unicodedata'
+        echo 'LOCAL_CFLAGS := -DPy_BUILD_CORE'
         echo "MY_PYTHON_SRC_ROOT := $PYTHON_SRCDIR"
+        echo 'LOCAL_C_INCLUDES := $(MY_PYTHON_SRC_ROOT)/Include/internal'
         echo 'LOCAL_SRC_FILES := \'
         echo '  $(MY_PYTHON_SRC_ROOT)/Modules/unicodedata.c'
         echo 'LOCAL_STATIC_LIBRARIES := python_shared'

scripts/crystax-sources/sqlite/3/Android.mk

@@ -0,0 +1,7 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := sqlite3_static
+LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libsqlite3.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+include $(PREBUILT_STATIC_LIBRARY)

src/main/python/lbrynetservice.py

@@ -21,6 +21,9 @@ from lbry.conf import Config
 from lbry.extras.daemon.components import DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
 from lbry.extras.daemon.daemon import Daemon
 
+import sqlite3
+import ssl
+
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
 
@@ -122,7 +125,7 @@ def start():
 
     configure_logging(conf)
     log.info('Starting lbry sdk {}'.format(lbrynet_version));
-
+    log.info('openssl: {}, sqlite3: {}'.format(ssl.OPENSSL_VERSION, sqlite3.sqlite_version))
     loop = asyncio.get_event_loop()
     loop.set_debug(lbrynet_android_utils.isDebug())