android/Bootstrap/Makefile.shared                 |    8 +++++---
 android/experimental/LibreOffice4Android/Makefile |    2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9dd8fac9808d9ccf2acd33ba202ab4506e6d2b56
Author: Tor Lillqvist <[email protected]>
Date:   Wed Aug 8 11:39:30 2012 +0300

    Also set up the local.properties of abs-lib
    
    Change-Id: Icf71e912687d182b0e38efd00626f86df39b1311

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 8bae333..74a1dbb 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -222,6 +222,8 @@ copy-stuff:
        echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup
 
 build-ant: copy-stuff properties
+       echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
+
 #
 # Copy jar files we need, and even construct one.
 #
commit cbca382f2fc0c64b409160d390357ba520c94259
Author: Tor Lillqvist <[email protected]>
Date:   Wed Aug 8 11:38:54 2012 +0300

    Clarify that "stop" and "start" is only for simulator, I guess
    
    Change-Id: I0bb98a9842003973ad50f227961ac00197f85bf2

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index d593676..be26927 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -52,8 +52,10 @@ clean: properties
        $(ANT) clean
        rm -rf assets $(SODEST) $(OBJLOCAL)
 
-# If you reinstall an app several times, even if you uninstall it
-# between, disk space seems to leak that won't get recycled until you
-# stop and start...
+# If you reinstall an app several times *on the simulator*, even if you
+# uninstall it between, disk space seems to leak that won't get recycled until
+# you stop and start... No idea if this holds for a device, too. (And you
+# can't "stop" a device anyway.)
+
 stop-start-cycle:
        $(ANDROID_SDK_HOME)/platform-tools/adb shell stop && 
$(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to