Python-List
diff --git a/‎README.rst‎
Lines changed: 2 additions & 0 deletions b/‎README.rst‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎distribute.sh‎
Lines changed: 11 additions & 8 deletions b/‎distribute.sh‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎recipes/android/recipe.sh‎
Lines changed: 46 additions & 0 deletions b/‎recipes/android/recipe.sh‎
Lines changed: 46 additions & 0 deletions
@@ -127,3 +127,5 @@ TODO
 - Make Android API configurable (defined in src/default.properties => shoudl be generated)
 - jni/Android.mk must not include ttf/image/mixer if not asked by the user
 - application should be automatically generated (Android.mk etc...)
+- Python try always to import name.so, namemodule.so, name.py, name.pyo ?
+- restore libpymodules.so loading to reduce the number of dlopen.
@@ -14,7 +14,7 @@ ROOT_PATH="$(dirname $(readlink -f $0))"
 RECIPES_PATH="$ROOT_PATH/recipes"
 BUILD_PATH="$ROOT_PATH/build"
 LIBS_PATH="$ROOT_PATH/build/libs"
-PACKAGES_PATH="$BUILD_PATH/packages"
+PACKAGES_PATH="$ROOT_PATH/.packages"
 SRC_PATH="$ROOT_PATH/src"
 JNI_PATH="$SRC_PATH/jni"
 DIST_PATH="$ROOT_PATH/dist"
@@ -173,10 +173,10 @@ function run_prepare() {
 	done
 
 	# create build directory if not found
+	test -d $PACKAGES_PATH || mkdir -p $PACKAGES_PATH
 	if [ ! -d $BUILD_PATH ]; then
 		mkdir -p $BUILD_PATH
 		mkdir -p $LIBS_PATH
-		mkdir -p $PACKAGES_PATH
 	fi
 
 	# create initial files
@@ -185,7 +185,7 @@ function run_prepare() {
 }
 
 function run_source_modules() {
-	needed=(hostpython python $MODULES)
+	needed=(hostpython python android $MODULES)
 	declare -A processed
 
 	while [ ${#needed[*]} -ne 0 ]; do
@@ -231,7 +231,7 @@ function run_order_modules() {
 		rm $filename
 	fi
 
-	for module in hostpython python $MODULES; do
+	for module in hostpython python android $MODULES; do
 		# get priority
 		priority="PRIORITY_$module"
 		priority=${!priority}
@@ -401,19 +401,22 @@ function run_distribute() {
 	try cp -a $BUILD_PATH/libs/* libs/$ARCH/
 
 	debug "Fill private directory"
-	try cp -a python-install/lib/python* private/lib
-	try mv private/lib/lib-dynload/*.so private/
+	try cp -a python-install/lib private/
+	try mkdir -p private/include/python2.7
+	try cp python-install/include/python2.7/pyconfig.h private/include/python2.7/
 
 	debug "Reduce private directory from unwanted files"
-	cd $DIST_PATH/private/lib
+	try rm -f $DIST_PATH/private/lib/libpython2.7.so
+	try rm -rf $DIST_PATH/private/lib/pkgconfig
+	try cd $DIST_PATH/private/lib/python2.7
 	try find . | grep -E '*\.(py|pyc|so\.o|so\.a|so\.libs)$' | xargs rm
 	try rm -rf test
 	try rm -rf ctypes
 	try rm -rf lib2to3
 	try rm -rf lib-tk
 	try rm -rf idlelib
 	try rm -rf unittest/test
-	try rm -rf lib-dynload
+	#try rm -rf lib-dynload
 	try rm -rf json/tests
 	try rm -rf distutils/tests
 	try rm -rf email/test
 
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+PRIORITY_android=30
+VERSION_android=
+URL_android=
+DEPS_android=(pygame)
+MD5_android=
+BUILD_android=$BUILD_PATH/android/android
+RECIPE_android=$RECIPES_PATH/android
+
+function prebuild_android() {
+	cd $BUILD_PATH/android
+
+	if [ ! -d android ]; then
+		try cp -a $RECIPE_android/src $BUILD_android
+	fi
+}
+
+function build_android() {
+	cd $BUILD_android
+
+	# if the last step have been done, avoid all
+	if [ -f .done ]; then
+		return
+	fi
+	
+	push_arm
+
+	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
+
+	# cythonize
+	try cython android.pyx
+	try cython android_sound.pyx
+	try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -i
+
+	# copy files
+	try cp android.so android_sound.so android_mixer.py \
+		$BUILD_PATH/python-install/lib/python2.7/
+
+	touch .done
+	pop_arm
+}
+
+function postbuild_android() {
+	true
+}