android/Bootstrap/src/org/libreoffice/android/Bootstrap.java | 8 ++++---- sal/osl/unx/file_misc.cxx | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-)
New commits: commit 73a47ed3750bde3de1f8abcf0005ee068b1ed96e Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Jan 31 14:06:37 2012 +0200 Set TMPDIR for osl_getTempDirURL() diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index a51315b..ac5d027 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -143,6 +143,9 @@ public class Bootstrap extends NativeActivity argv = Arrays.copyOfRange(argv, 1, argv.length-1); } + // TMPDIR is used by osl_getTempDirURL() + putenv("TMPDIR=" + getCacheDir().getAbsolutePath()); + // argv[0] will be replaced by android_main() in lo-bootstrap.c by the // pathname of the mainLibrary. String[] newargv = new String[argv.length + 1]; commit 427edef2c780b40513af0491d5cbe865233d0650 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Jan 31 13:57:11 2012 +0200 putenv() does seem to be process-wide diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 9e21056..a51315b 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -136,10 +136,7 @@ public class Bootstrap extends NativeActivity String[] argv = CommandLine.split(cmdLine); - // Handle env var assignments in the command line. Actually - // not sure if this works, are environments per-thread in - // Android? This code runs in a different thread than that in - // which lo_main etc will run. + // Handle env var assignments in the command line. while (argv.length > 0 && argv[0].matches("[A-Z_]+=.*")) { putenv(argv[0]); commit 299fa646833c1e00448a039f57510a76c6cbb250 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Jan 31 13:53:12 2012 +0200 No need to wait for debugger here on Android, this code does seem to work diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 962d7bf..edd4eec 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -1055,14 +1055,6 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD int DestFileFD=0; int nRet=0; -#ifdef ANDROID - volatile int beenhere = 0; - if (!beenhere) { - beenhere++; - fprintf(stderr, "Sleeping NOW, start ndk-gdb!\n"); - ::sleep(20); - } -#endif if (osl_openFilePath(pszSourceFileName, &SourceFileFH, osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != osl_File_E_None) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits