android/Bootstrap/Makefile.shared | 4 -
android/experimental/LibreOffice4Android/dummies.cxx | 44 +++++++++++++++++++
android/experimental/desktop/dummies.cxx | 44 +++++++++++++++++++
include/sal/mathconf.h | 2
4 files changed, 91 insertions(+), 3 deletions(-)
New commits:
commit cd7c0c6adfff3509630fda21d483c2cf5d76d275
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 23 10:43:45 2013 +0300
There is no inc in solver any more
Change-Id: I83c1001d67a9c3e5c2a6e2ff4c93a97214f24475
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 317e539..27b2c13 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -108,7 +108,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a)
native-code.cxx dummies.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
-I$(OUTDIR)/inc native-code.cxx dummies.cxx -L$(OUTDIR)/lib
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid
-ljnigraphics -llog -lz
+ $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
native-code.cxx dummies.cxx -L$(OUTDIR)/lib -L$(INSTDIR)/$(LIBO_LIB_FOLDER)
$(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
commit c95393cbf35fd59be203c38e52ac627ff0a184d3
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 23 10:33:12 2013 +0300
Add dummy implementations of the UI layer callbacks now required
Change-Id: I2caaac66758863b0f384df13ab30526f21be1e8d
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index a78a663..317e539 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -106,9 +106,9 @@ WHOLELIBS = \
-Wl,--no-whole-archive
-$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a)
native-code.cxx
+$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a)
native-code.cxx dummies.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc
native-code.cxx -L$(OUTDIR)/lib -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS)
$(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
+ $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
-I$(OUTDIR)/inc native-code.cxx dummies.cxx -L$(OUTDIR)/lib
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid
-ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/android/experimental/LibreOffice4Android/dummies.cxx
b/android/experimental/LibreOffice4Android/dummies.cxx
new file mode 100644
index 0000000..89766e8
--- /dev/null
+++ b/android/experimental/LibreOffice4Android/dummies.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// Dummy implementations of the callback functions in the UI layer
+// that the LO layer calls. As this experimental Android app doesn't
+// handle any of that, these do nothing.
+
+#include <touch/touch.h>
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_start(MLOSelectionKind kind,
+ const void *documentHandle,
+ MLORect *rectangles,
+ int rectangleCount,
+ void *preview)
+{
+}
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_resize_done(bool success,
+ const void *documentHandle,
+ MLORect *rectangles,
+ int rectangleCount)
+{
+}
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_none()
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/desktop/dummies.cxx
b/android/experimental/desktop/dummies.cxx
new file mode 100644
index 0000000..89766e8
--- /dev/null
+++ b/android/experimental/desktop/dummies.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// Dummy implementations of the callback functions in the UI layer
+// that the LO layer calls. As this experimental Android app doesn't
+// handle any of that, these do nothing.
+
+#include <touch/touch.h>
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_start(MLOSelectionKind kind,
+ const void *documentHandle,
+ MLORect *rectangles,
+ int rectangleCount,
+ void *preview)
+{
+}
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_resize_done(bool success,
+ const void *documentHandle,
+ MLORect *rectangles,
+ int rectangleCount)
+{
+}
+
+extern "C"
+__attribute__ ((visibility("default")))
+void
+touch_ui_selection_none()
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e165bf2af00e743cd6113e293f8db7bf749d6f53
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 23 10:31:42 2013 +0300
Define SAL_MATH_FINITE for Android, too
Using the same "finite()" as on (GNU/)Linux seems to work.
Change-Id: Iad3baa967194f09d7ca25fb9b316b780de5bb90f
diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h
index fefd213..44adf8b 100644
--- a/include/sal/mathconf.h
+++ b/include/sal/mathconf.h
@@ -72,7 +72,7 @@ extern "C" {
#define SAL_MATH_FINITE(d) isfinite(d)
#elif defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
-#elif defined LINUX || defined UNX
+#elif defined(ANDROID) || defined LINUX || defined UNX
#define SAL_MATH_FINITE(d) finite(d)
#else /* WNT, LINUX, UNX */
#error "SAL_MATH_FINITE not defined"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
