README.Android | 30 ++++------ android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 4 - configure.ac | 2 desktop/source/lib/init.cxx | 2 sal/osl/unx/file.cxx | 3 - solenv/bin/native-code.py | 5 + 6 files changed, 21 insertions(+), 25 deletions(-)
New commits: commit 5fff33ff40f2b36060bcb635ec7b908ec59e3d73 Author: Jan Holesovsky <ke...@collabora.com> Date: Mon Feb 9 10:28:54 2015 +0100 It is not necessary to be _that_ verbose. Change-Id: Ie7685beae20df8b3798070135fad529cde3604a9 diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 659526b..85d75c9 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -281,7 +281,6 @@ sal_uInt64 FileHandle_Impl::getPos() const oslFileError FileHandle_Impl::setPos (sal_uInt64 uPos) { - SAL_INFO("sal.file", "FileHandle_Impl::setPos(" << m_fd << ", " << getPos() << ") => " << uPos); m_fileptr = sal::static_int_cast< off_t >(uPos); return osl_File_E_None; } @@ -377,7 +376,6 @@ oslFileError FileHandle_Impl::readAt ( if (-1 == nBytes) return oslTranslateFileError (OSL_FET_ERROR, errno); - SAL_INFO("sal.file", "FileHandle_Impl::readAt(" << m_fd << ", " << nOffset << ", " << nBytes << ")"); *pBytesRead = nBytes; return osl_File_E_None; } @@ -400,7 +398,6 @@ oslFileError FileHandle_Impl::writeAt ( if (-1 == nBytes) return oslTranslateFileError (OSL_FET_ERROR, errno); - SAL_INFO("sal.file", "FileHandle_Impl::writeAt(" << m_fd << ", " << nOffset << ", " << nBytes << ")"); m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + nBytes)); *pBytesWritten = nBytes; commit 06ab144fdbbb51b22eba706b3a75bef2ab2a3a32 Author: Jan Holesovsky <ke...@collabora.com> Date: Mon Feb 9 10:12:57 2015 +0100 native-code.py: Add libevtattlo.a + some forms related services. Fixes part of fields.doc loading, but unfortunately not completely, as in the end it needs "com_sun_star_comp_dba_ORowSet_get_implementation" - and we avoid the database stuff for now still. Change-Id: I9035e80fb1326357dbecf7994419d909e1f25373 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 4f20e89..07c06e6 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -22,6 +22,7 @@ import xml.etree.ElementTree as ET core_factory_list = [ ("libembobj.a", "embobj_component_getFactory"), + ("libevtattlo.a", "evtatt_component_getFactory"), ("libreflectionlo.a", "reflection_component_getFactory"), ("libstocserviceslo.a", "stocservices_component_getFactory"), ("libchartcorelo.a", "chartcore_component_getFactory"), @@ -64,6 +65,9 @@ core_factory_list = [ core_constructor_list = [ # chart2/source/controller/chartcontroller.component "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", +# forms/util/frm.component + "com_sun_star_comp_forms_ODatabaseForm_get_implementation", + "com_sun_star_form_OFormsCollection_get_implementation", # framework/util/fwk.component "com_sun_star_comp_framework_AutoRecovery_get_implementation", "com_sun_star_comp_framework_Desktop_get_implementation", @@ -119,6 +123,7 @@ core_constructor_list = [ "com_sun_star_comp_stoc_Introspection_get_implementation", # toolkit/util/tk.component "stardiv_Toolkit_UnoComboBoxControl_get_implementation", + "stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation", "stardiv_Toolkit_UnoControlComboBoxModel_get_implementation", "stardiv_Toolkit_UnoControlContainer_get_implementation", "stardiv_Toolkit_UnoControlContainerModel_get_implementation", commit 63e944a878e07213abd76a37d195951e7d017999 Author: Jan Holesovsky <ke...@collabora.com> Date: Sun Feb 8 00:28:12 2015 +0100 android: Update README.Android with the recent ndk-gdb info. Change-Id: I23d76562c85ff458bdc539a8ba0681a847e647c5 diff --git a/README.Android b/README.Android index 98a109d..19f54f9 100644 --- a/README.Android +++ b/README.Android @@ -46,7 +46,19 @@ know. But don't seem to be necessary on a real device anyway? * Debugging - Install the .apk to the device, and: + First of all, you need to configure the build with --enable-debug or +--enable-dbgutil. You may want to provide --enable-selective-debuginfo too, +like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory +during linking. + + You also want to avoid --with-android-package-name (or when you use +that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain +that + +ERROR: Could not extract package's data directory. Are you sure that + your installed application is debuggable? + + When you have all this, install the .apk to the device, and: cd android/experimental/LOAndroid3 <android-ndk-r10d>/ndk-gdb --adb=<android-sdk-linux>/platform-tools/adb --start @@ -55,22 +67,6 @@ know. But don't seem to be necessary on a real device anyway? and the "pending breakpoints do not work" problems are now resolved with the current NDK. -* Getting the symbols - -In order to be able to debug, you also need the symbols. Currently they are -stripped using a $(STRIP) call in android/Bootstrap/Makefile.shared ; make -sure you change it only to 'cp'. - -But then you need to limit the size of the resulting binary by other means, -that is strip most of the symbols (but the interesting ones) already during -the build. For that, use something like - ---enable-dbgutil ---enable-selective-debuginfo="sal/" - -in your autogen.input (but of course limit the --enable-selective-debuginfo -only to directories / libraries that are interesting to you). - * Common Errors / Gotchas lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so commit 001a4fb7247957a0b0ce66a1a9f25d812ab518ac Author: Jan Holesovsky <ke...@collabora.com> Date: Sun Feb 8 00:15:25 2015 +0100 android: Even --enable-debug needs org.libreoffice for debugging. Change-Id: If6fb1eb2e8dbcf885b27d10202295e8c11177d49 diff --git a/configure.ac b/configure.ac index 7eeaaa1..34b129a 100644 --- a/configure.ac +++ b/configure.ac @@ -12307,7 +12307,7 @@ if echo "$host_os" | grep -q linux-android ; then ANDROID_PACKAGE_NAME= AC_MSG_CHECKING([for Android package name]) if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then - if test -n "$ENABLE_DBGUTIL"; then + if test -n "$ENABLE_DEBUG"; then # Default to the package name that makes ndk-gdb happy. ANDROID_PACKAGE_NAME="org.libreoffice" else commit e13916fc228bf092dddf6b4e6bcd09b0a837adf4 Author: Jan Holesovsky <ke...@collabora.com> Date: Sat Feb 7 20:19:29 2015 +0100 android: Set a more verbose SAL_LOG. Change-Id: I7ce3d8eeaaa307ad2c779b2b57d5d3f34258ae5f diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java index 5f82763..2caf748 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java @@ -43,7 +43,7 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback mTileWidth = pixelToTwip(TILE_SIZE, mDPI); mTileHeight = pixelToTwip(TILE_SIZE, mDPI); - LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO.lok"); + LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO"); LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext); mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle()); @@ -54,7 +54,6 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback mDocument = mOffice.documentLoad(input); if (mDocument == null) { - LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO"); Log.i(LOGTAG, "====> mOffice.documentLoad() returned null, trying to restart 'Office' and loading again"); mOffice.destroy(); Log.i(LOGTAG, "====> mOffice.destroy() done"); @@ -63,7 +62,6 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback mOffice = new Office(handle); Log.i(LOGTAG, "====> new Office created"); mDocument = mOffice.documentLoad(input); - LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO.lok"); } Log.i(LOGTAG, "====> mDocument = " + mDocument); commit 364937f885ba83e66b8ac9287a3ca25cdceddcf8 Author: Jan Holesovsky <ke...@collabora.com> Date: Sat Feb 7 19:57:29 2015 +0100 LOK: Return NULL when we failed to load the document. Change-Id: I7740549f35cdbe21556e1e066bbc6c0355463b79 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 154a8f5a..52c5d8f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -327,7 +327,6 @@ static LibreOfficeKitDocument* lo_documentLoad(LibreOfficeKit* pThis, const char return NULL; } - try { uno::Reference<lang::XComponent> xComponent; @@ -339,6 +338,7 @@ static LibreOfficeKitDocument* lo_documentLoad(LibreOfficeKit* pThis, const char { pLib->maLastExceptionMsg = "loadComponentFromURL returned an empty reference"; SAL_INFO("lok", "Document can't be loaded - " << pLib->maLastExceptionMsg); + return NULL; } return new LibLODocument_Impl(xComponent); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits