bleh

olymk2 · olymk2 · commit 243fcdd77ef2 · 2015-03-17T19:39:18.000Z
diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #https://groups.google.com/forum/?hl=en#!searchin/python-android/ctypes/python-android/vDaaJXNYz_A/eazMVI-DQSYJ
 #/home/oly/.buildozer/android/platform/
 
-export ANDROIDSDK="/home/omarks/.buildozer/android/platform/android-sdk-20"
+export ANDROIDSDK="/home/omarks/.buildozer/android/platform/android-sdk-21"
 export ANDROIDNDK="/home/omarks/.buildozer/android/platform/android-ndk-r9d"
 export ANDROIDNDKVER=r9
 export ANDROIDAPI=14
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -20,7 +20,7 @@ function prebuild_python() {
 	fi
 
 	try patch -p1 < $RECIPE_python/patches/Python-$VERSION_python-xcompile.patch
-    try patch -p1 < $RECIPE_python/patches/Python-$VERSION_python-ctypes-disable-wchar.patch
+        try patch -p1 < $RECIPE_python/patches/Python-$VERSION_python-ctypes-disable-wchar.patch
 	try patch -p1 < $RECIPE_python/patches/disable-modules.patch
 	try patch -p1 < $RECIPE_python/patches/fix-locale.patch
 	try patch -p1 < $RECIPE_python/patches/fix-gethostbyaddr.patch
@@ -93,15 +93,13 @@ function build_python() {
 		export LDFLAGS="$LDFLAGS -L$SRC_PATH/obj/local/$ARCH/"
 	fi
 
-	export HOSTARCH=arm-eabi
-	export BUILDARCH=x86_64-linux-gnu
-
-
 	# CFLAGS for python ctypes library
 	export CFLAGS="$CFLAGS -DNO_MALLINFO"
+	export BUILDARCH=x86_64-linux-gnu
+	export HOSTARCH=arm-eabi
 
-	try ./configure --host=arm-eabi --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
-	echo ./configure --host=arm-eabi --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
+	try ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
+	echo ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo $MAKE HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	cp HOSTPYTHON=$BUILD_python/hostpython python
 
@@ -129,8 +127,10 @@ function build_python() {
     echo '############copy ctypes'
     cd $BUILD_python
     echo $BUILD_python
+    echo pwd
     echo build/lib.linux-x86_64-2.7/_ctypes*.so
     try cp -a build/lib.linux-x86_64-2.7/_ctypes*.so $LIBS_PATH
+    #exit 0
 
 	# reduce python
 	rm -rf "$BUILD_PATH/python-install/lib/python2.7/test"
diff --git a/src/src/org/renpy/android/PythonService.java b/src/src/org/renpy/android/PythonService.java
@@ -89,6 +89,9 @@ public void run(){
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
 
+        System.loadLibrary("ctypes");
+	System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
+
         try {
             System.loadLibrary("sqlite3");
             System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_sqlite3.so");
