[Libreoffice-commits] .: 2 commits - connectivity/source solenv/gbuild solenv/inc

[Tor Lillqvist]

 connectivity/source/inc/hsqldb/HStorageAccess.hxx |    8 ++++----
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk         |   11 +++++++++++
 solenv/inc/unxandr.mk                             |   10 +++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 1171165b587480d9dde9c378b2998f3c26b83220
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 25 17:53:51 2011 +0200

    Fix Android compilation: 'NULL' was not declared in this scope

diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 079d8c7..dc9151d 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -36,10 +36,10 @@ namespace connectivity { namespace hsqldb
     class DataLogFile;
 } }
 
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = NULL );
+jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, ::connectivity::hsqldb::DataLogFile* logger = 0 );
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = 0 );
 
 #endif // CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
 
commit ea19e7243b3a4bd49cbad0cf03a5e9f50b2e3148
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 25 14:06:28 2011 +0200

    No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index cbcd3e6..53e571c 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -78,4 +78,15 @@ gb_Library_FILENAMES := \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+define gb_Library_get_rpath
+endef
+
+define gb_Executable_get_rpath
+endef
+
+gb_LinkTarget_LDFLAGS := $(subst -Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
+
 # vim: set noet sw=4:
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 49b481a..9d172df 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -52,5 +52,13 @@ STDSHLCUIMT+=-llog -landroid -lgnustl_shared
 
 # All shared libraries we build must start with "lib" because
 # otherwise the Android package installer will not unpack them from
-# the .apk into the app's lib directory
+# the .apk into the app's lib directory.
 ENFORCEDSHLPREFIX=lib
+
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+LINKFLAGSRUNPATH_URELIB=
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=
+LINKFLAGSRUNPATH_SDK=