[Libreoffice-commits] core.git: cppu/source

[Libreoffice Gerrit user]

 cppu/source/uno/lbenv.cxx |    4 ++++
 cppu/source/uno/lbmap.cxx |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit adca0b98c63a4365eb83664b3254eaa828a1ca14
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jan 29 15:59:14 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jan 29 15:59:56 2019 +0100

    cppu: fix Android build
    
    By restoring includes which are still needed, conditionally.
    
    Change-Id: Icc331c7d6a084af7d93b941ea879f0c60b9ca9f3

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 7ad96d5a9110..9e9de7655041 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifdef DISABLE_DYNLOADING
+#include <config_java.h>
+#endif
+
 #include <cppu/EnvDcp.hxx>
 
 #include <sal/log.hxx>
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index bba5756c0bd5..54852a63082f 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifdef DISABLE_DYNLOADING
+#include <config_java.h>
+#endif
+
 #include "IdentityMapping.hxx"
 
 #include <cassert>