Android build script adaptations.

MANIFEST.in

@@ -31,6 +31,7 @@ include .tidyallrc
 include android/*.py
 include android/mk*
 include android/initsdk
+include android/initsupport
 include android/debian/*
 #graft data/plugins
 ##

android/initsupport

@@ -7,11 +7,4 @@ set -eux
 liburl="https://maven.google.com/com/android/support/support-v4/24.1.1"
 libname="support-v4-24.1.1.aar"
 
-if [[ ! -f ${libdir}/${libname} ]]; then
-  mkdir -p ${libdir}
-  pushd ${libdir}
-  wget ${liburl}/${libname}
-  popd
-else
-  echo "Skipping supportlib download as already present."
-fi
+. mkp4a.preload supportlib ${liburl} ${libname}

android/mkp4a.common

@@ -10,7 +10,7 @@ cardsets_file="${cardsets_dir}.tar.xz"
 
 sdkdir="${HOME}/.cache/sdk-for-p4a/sdk"
 ndkdir="${HOME}/.cache/sdk-for-p4a/android-ndk-r17c"
-libdir="${HOME}/.cache/sdk-for-p4a/libs"
+pkgdir="${HOME}/.local/share/python-for-android/packages"
 
 # gradle may need this.
 export TERM="xterm"

android/mkp4a.init

@@ -48,7 +48,7 @@ rm -rf ${tmpdir}/setup.py
 rm -rf ${tmpdir}/setup_osx.py
 rm -rf ${tmpdir}/setup.cfg
 
-cp -a ${libdir}/support-v4-24.1.1.aar ${tmpdir}
+cp -a ${pkgdir}/supportlib/support-v4-24.1.1.aar ${tmpdir}
 cp -a main.py ${tmpdir}
 mkdir -p ${tmpdir}/data/images/cards/bottoms/trumps-only
 echo "" > ${tmpdir}/data/images/cards/bottoms/trumps-only/.keep