[corlib] CompressedStack in not supported in mobile profile

[mono.git] / mcs / class / corlib / System.IO / LogcatTextWriter.cs

diff --git a/mcs/class/corlib/System.IO/LogcatTextWriter.cs b/mcs/class/corlib/System.IO/LogcatTextWriter.cs
index da9e3075c61c9c0e728adecf4a446bca04774dcb..3d9787957be9043b0fd445a72a118e0aa4391a8d 100644 (file)
--- a/mcs/class/corlib/System.IO/LogcatTextWriter.cs
+++ b/mcs/class/corlib/System.IO/LogcatTextWriter.cs
@@ -10,6 +10,7 @@ namespace System.IO {
        class LogcatTextWriter : TextWriter {
 
                const string LibLog = "/system/lib/liblog.so";
+               const string LibLog64 = "/system/lib64/liblog.so";
 
                TextWriter stdout;
                readonly string appname;
@@ -27,8 +28,9 @@ namespace System.IO {
 
                public override void Write (string s)
                {
-                       foreach (char c in s)
-                               Write (c);
+                       if (s != null)
+                               foreach (char c in s)
+                                       Write (c);
                }
 
                public override void Write (char value)
@@ -62,10 +64,10 @@ namespace System.IO {
 
                public static bool IsRunningOnAndroid ()
                {
-                       return File.Exists (LibLog);
+                       return File.Exists (LibLog) || File.Exists (LibLog64);
                }
 
-               [DllImport (LibLog)]
+               [DllImport ("liblog")]
                static extern void __android_log_print (LogLevel level, string appname, string format, string args, IntPtr zero);
 
                static void Log (LogLevel level, string appname, string log)