[Libreoffice-commits] .: Branch 'feature/android' - 3 commits - sal/android vcl/Module_vcl.mk

[Tor Lillqvist]

 sal/android/lo-bootstrap.c |    8 ++++----
 vcl/Module_vcl.mk          |    6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 513e187c431ef1b7e0e2504263c12cc9083252d3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 27 18:35:21 2012 +0200

    Drop accidental #include

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 5813138..b5a0a05 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -47,7 +47,7 @@
 #include <android/log.h>
 
 #include "uthash.h"
-#include <osl/thread.h>
+
 #include "osl/detail/android-bootstrap.h"
 
 #pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
commit f0e5ca4d0be13e8494ad2de4c97a192537388ec5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 27 12:15:14 2012 +0200

    We don't use Library_vclplug_svp on Android any more

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 47da575..0a91f87 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -79,10 +79,4 @@ $(eval $(call gb_Module_add_targets,vcl,\
 ))
 endif
 
-ifeq ($(GUIBASE),android)
-$(eval $(call gb_Module_add_targets,vcl,\
-    Library_vclplug_svp \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
commit 0a1fb4b618ad56fe11071a60105dbf70cc38892e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 27 11:32:22 2012 +0200

    Tweak the st_mode returned by lo_apk_lstat() to match reality better

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index eee5f1f..5813138 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1081,7 +1081,7 @@ new_stat(const char *path,
     struct tm tm;
 
     memset(statp, 0, sizeof(*statp));
-    statp->st_mode = mode | S_IRUSR | S_IRGRP | S_IROTH;
+    statp->st_mode = mode | S_IRUSR;
     statp->st_nlink = 1;
 
     statp->st_uid = getuid();
@@ -1133,7 +1133,7 @@ lo_apk_lstat(const char *path,
     if (*pn == '/') {
         pn++;
         if (!pn[0])
-            return new_stat(path, statp, NULL, S_IFDIR, 1);
+            return new_stat(path, statp, NULL, S_IFDIR | S_IXUSR, 1);
     }
 
     name_size = strlen(pn);
@@ -1149,7 +1149,7 @@ lo_apk_lstat(const char *path,
         if (letoh16(entry->filename_size) == name_size)
             return new_stat(path, statp, entry, S_IFREG, cdir_entries - count + 1);
         else
-            return new_stat(path, statp, entry, S_IFDIR, cdir_entries - count + 1);
+            return new_stat(path, statp, entry, S_IFDIR | S_IXUSR, cdir_entries - count + 1);
     }
 
     errno = ENOENT;