Merge branch 'master' of github.com:kivy/python-for-android

tshirtman · tshirtman · commit 60481dc0c6f1 · 2012-06-30T14:24:55.000+02:00
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -41,6 +41,14 @@ Then, the android package (APK) will be generated at:
 
     bin/touchtracer-1.0-debug.apk
 
+.. warning::
+
+    Some files and modules for python are blacklisted by default to
+    save a few megabytes on the final apk file, in case your
+    applications doesn't find a standard python module, check the
+    src/blacklist.txt file remove the module you need from the list,
+    and try again.
+
 Available options to `build.py`::
 
     -h, --help            show this help message and exit
diff --git a/recipes/python/patches/fix-termios.patch b/recipes/python/patches/fix-termios.patch
@@ -0,0 +1,29 @@
+--- Python-2.7.2.orig/Modules/termios.c	2012-06-12 02:49:39.780162534 +0200
++++ Python-2.7.2/Modules/termios.c	2012-06-12 02:51:52.092157828 +0200
+@@ -227,6 +227,7 @@
+     return Py_None;
+ }
+ 
++#if 0 // No tcdrain defined for Android.
+ PyDoc_STRVAR(termios_tcdrain__doc__,
+ "tcdrain(fd) -> None\n\
+ \n\
+@@ -246,6 +247,7 @@
+     Py_INCREF(Py_None);
+     return Py_None;
+ }
++#endif
+ 
+ PyDoc_STRVAR(termios_tcflush__doc__,
+ "tcflush(fd, queue) -> None\n\
+@@ -301,8 +303,10 @@
+      METH_VARARGS, termios_tcsetattr__doc__},
+     {"tcsendbreak", termios_tcsendbreak,
+      METH_VARARGS, termios_tcsendbreak__doc__},
++#if 0 // No tcdrain defined for Android.
+     {"tcdrain", termios_tcdrain,
+      METH_VARARGS, termios_tcdrain__doc__},
++#endif
+     {"tcflush", termios_tcflush,
+      METH_VARARGS, termios_tcflush__doc__},
+     {"tcflow", termios_tcflow,
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -24,6 +24,7 @@ function prebuild_python() {
 	try patch -p1 < $RECIPE_python/patches/fix-gethostbyaddr.patch
 	try patch -p1 < $RECIPE_python/patches/fix-setup-flags.patch
 	try patch -p1 < $RECIPE_python/patches/fix-filesystemdefaultencoding.patch
+	try patch -p1 < $RECIPE_python/patches/fix-termios.patch
 	try patch -p1 < $RECIPE_python/patches/custom-loader.patch
 	try patch -p1 < $RECIPE_python/patches/verbose-compilation.patch
 
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -405,8 +405,8 @@ public void waitForResume() {
     public static void setOpenFile(){
         final android.content.Intent intent = mActivity.getIntent();
         if (intent != null) {
-            final android.net.Uri data = intent.getData ();
-            if (data != null){
+            final android.net.Uri data = intent.getData();
+            if (data != null && data.getEncodedPath() != null){
                 nativeSetEnv("PYTHON_OPENFILE", data.getEncodedPath());
             }
         }
@@ -610,9 +610,8 @@ public void run() {
 			return;
 		}
 
-                Log.w(TAG, "Done");
-                waitForStart();
-                setOpenFile();
+		Log.w(TAG, "Done");
+		waitForStart();
 
         nativeResize(mWidth, mHeight);
         nativeInitJavaCallbacks();
@@ -621,6 +620,18 @@ public void run() {
         nativeSetEnv("PYTHONOPTIMIZE", "2");
         nativeSetEnv("PYTHONHOME", mFilesDirectory);
         nativeSetEnv("PYTHONPATH", mArgument + ":" + mFilesDirectory + "/lib");
+
+		// XXX Using SetOpenFile make a crash in nativeSetEnv. I don't
+		// understand why, maybe because the method is static or something.
+		// Anyway, if you remove that part of the code, ensure the Laucher
+		// (ProjectChooser) is still working.
+		final android.content.Intent intent = mActivity.getIntent();
+		if (intent != null) {
+			final android.net.Uri data = intent.getData();
+			if (data != null && data.getEncodedPath() != null)
+				nativeSetEnv("PYTHON_OPENFILE", data.getEncodedPath());
+		}
+
 		nativeSetMultitouchUsed();
         nativeInit();
 
