Added python internal log -> logcat redirection

inclement · inclement · commit 63bcbd09091a · 2015-11-01T00:47:59.000Z
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -38,6 +38,7 @@ def prebuild_armeabi(self):
         self.apply_patch(join('patches', 'python-{version}-python-misc.patch'.format(version=self.version)))
 
         self.apply_patch(join('patches', 'python-{version}-libpymodules_loader.patch'.format(version=self.version)))
+        self.apply_patch('log_failures.patch')
         
 
         shprint(sh.touch, join(build_dir, '.patched'))
@@ -67,6 +68,7 @@ def build_armeabi(self):
             # shprint(sh.cp, join(hostpython_recipe.get_recipe_dir(), 'Setup'), 'Modules')
 
             env = ArchAndroid(self.ctx).get_env()
+            env["LDFLAGS"] = env["LDFLAGS"] + ' -llog'
 
             # AND: Should probably move these to get_recipe_env for
             # neatness, but the whole recipe needs tidying along these
diff --git a/pythonforandroid/recipes/python3/log_failures.patch b/pythonforandroid/recipes/python3/log_failures.patch
@@ -0,0 +1,26 @@
+diff --git a/Python/pythonrun.c b/Python/pythonrun.c
+index 0327830..903cc02 100644
+--- a/Python/pythonrun.c
++++ b/Python/pythonrun.c
+@@ -39,6 +39,11 @@
+ #define PATH_MAX MAXPATHLEN
+ #endif
+ 
++/* p4a log redirect */
++#include <jni.h>
++#include "android/log.h"
++#define LOG(x) __android_log_write(ANDROID_LOG_INFO, "python", (x))
++
+ _Py_IDENTIFIER(builtins);
+ _Py_IDENTIFIER(excepthook);
+ _Py_IDENTIFIER(flush);
+@@ -2594,6 +2599,9 @@ Py_FatalError(const char *msg)
+ {
+     const int fd = fileno(stderr);
+     PyThreadState *tstate;
++    
++    LOG("Py_FatalError called!");
++    LOG(msg);
+ 
+     fprintf(stderr, "Fatal Python error: %s\n", msg);
+     fflush(stderr); /* it helps in Windows debug build */
