[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 4 commits - Makefile.in README.Android

[Miklos Vajna]

 Makefile.in    |    2 +-
 README.Android |   34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit fef682c20210a024aaadfc9368f3d36c2108aac3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 20 16:12:25 2015 +0100

    README.Android: document how to get pretty-printers work
    
    Change-Id: I0e421aaa38934f6fb2dd8992261ebcde80896e12

diff --git a/README.Android b/README.Android
index 8e9702e..4094ef2 100644
--- a/README.Android
+++ b/README.Android
@@ -25,23 +25,19 @@ In order to have proper acceleration, you need the 32-bit libGL.so:
 	ant debug install
 	adb logcat
 
-	And if all goes well - you should have some nice unit test output to
-enjoy. After a while of this loop you might find that you have lost a lot of
-space on your emulator's or device's /data volume. If using the emulator, you
-can do:
+	And if all goes well - you should have some nice debug output to enjoy
+when you start the app. After a while of this loop you might find that you have
+lost a lot of space on your emulator's or device's /data volume. If using the
+emulator, you can do:
 
 	adb shell stop; adb shell start
 
 but on a (non-rooted) device you probably just need to reboot it. On the other
 hand, this phenomenon might not happen on actual devices.
 
-	and continue onwards & upwards.
-
 * What about using a real device?
 
-	That works fine, too. You won't be able to use the "adb shell
-stop" and "adb shell start" commands to do anything, as far as I
-know. But don't seem to be necessary on a real device anyway?
+	That works fine, too.
 
 * Debugging
 
@@ -50,6 +46,10 @@ know. But don't seem to be necessary on a real device anyway?
 like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
 during linking.
 
+	Building with all symbols is also possible but the linking is currently
+slow (around 10 to 15 minutes) and you need lots of memory (around 16GB + some
+swap).
+
 	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
@@ -62,12 +62,12 @@ ERROR: Could not extract package's data directory. Are you sure that
 	cd android/experimental/LOAndroid3
 	<android-ndk-r10d>/ndk-gdb --adb=<android-sdk-linux>/platform-tools/adb --start
 
-	It seems that the "have to start the app before gdb can connect to it"
-and the "pending breakpoints do not work" problems are now resolved with the
-current NDK.
+	Pretty printers aren't loaded automatically due to the single shared
+	object, but you can still load them manually. E.g. to have a pretty-printer for
+	rtl::OString, you need:
 
-Building with all symbols is also possible but the linking is slow (around 10
-to 15 minutes) and you need lots of memory (around 16GB + some swap).
+	(gdb) python sys.path.insert(0, "/master/solenv/gdb")
+	(gdb) source /master/instdir/program/libuno_sal.so.3-gdb.py
 
 * Common Errors / Gotchas
 
commit 61f4696bb134d90af158f3fecc133489fffb2287
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 20 16:05:34 2015 +0100

    README.Android: document requirements for an all-symbol build
    
    Change-Id: I945b9833dee3a47cf23760b3f22917731a879e12

diff --git a/README.Android b/README.Android
index cfb0203..8e9702e 100644
--- a/README.Android
+++ b/README.Android
@@ -66,6 +66,9 @@ ERROR: Could not extract package's data directory. Are you sure that
 and the "pending breakpoints do not work" problems are now resolved with the
 current NDK.
 
+Building with all symbols is also possible but the linking is slow (around 10
+to 15 minutes) and you need lots of memory (around 16GB + some swap).
+
 * Common Errors / Gotchas
 
 lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so
commit b01122972dd6cd5e2ce233a15673ab600c47a5bf
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 20 16:04:11 2015 +0100

    README.Android: document how to install the self-built .apk
    
    Change-Id: I3539f406d0c425902efec0bee4c3701df8048593

diff --git a/README.Android b/README.Android
index 19f54f9..cfb0203 100644
--- a/README.Android
+++ b/README.Android
@@ -21,10 +21,9 @@ In order to have proper acceleration, you need the 32-bit libGL.so:
 
 	Then:
 
-	make cmd cmd=bash
-	cd android/qa/sc
-	make clean all install
-	make run ; adb shell logcat
+	cd android/experimental/LOAndroid3
+	ant debug install
+	adb logcat
 
 	And if all goes well - you should have some nice unit test output to
 enjoy. After a while of this loop you might find that you have lost a lot of
commit 40e8f401fe61fe24e202e6dd846e0fedab081838
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 20 15:52:23 2015 +0100

    android: install gdb printers
    
    Commit f44f94b95b435ee0ec71c73133daeb88cd2539b1 (fix gdb pretty printers
    for --enable-mergelibs, 2013-09-10) doesn't really say why this was
    wanted, probably just to be on the safe side.
    
    Enabling them allows at least manually loading them.
    
    Change-Id: I22eeca67e4077e06efba8b3edfd6eb84159b9c47

diff --git a/Makefile.in b/Makefile.in
index c1e7af1..b4c1ecf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,7 +239,7 @@ bootstrap: compilerplugins
 #       with some translations like "build"->"all" for historic reasons
 #
 build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
-ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
+ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
 	mkdir -p $(INSTDIR)
 	$(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
 endif