[Libreoffice-commits] .: 3 commits - android/experimental

[Tor Lillqvist]

 android/experimental/LibreOffice4Android/Makefile           |    6 ++++--
 android/experimental/LibreOffice4Android/project.properties |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit dfa5adcbc2ed31ebc16ec1e920f8305903a6ed7e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 8 12:39:24 2012 +0300

    Make sure the v4 support library used by abs-lib is found
    
    Change-Id: I425a8f0bea9d455b1ffd7ed4374bcde133e9a38c

diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index e89911e..18eba3e 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -223,7 +223,9 @@ copy-stuff:
 
 build-ant: copy-stuff properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
-
+# ActionBarSherlock uses the v4 support library, apparently one needs to copy
+# it like this for it to be found
+	cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../../abs-lib/libs
 #
 # Copy jar files we need
 #
commit c78ad3efa8c0f79d8f6506043f8d61d259520584
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 8 12:36:57 2012 +0300

    Bin incorect phrase in comment
    
    Change-Id: I49e75db020064e000d83c1689b548bfff95014df

diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 74a1dbb..e89911e 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -225,7 +225,7 @@ build-ant: copy-stuff properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
 
 #
-# Copy jar files we need, and even construct one.
+# Copy jar files we need
 #
 	for F in $(strip \
 		   java_uno \
commit f90a873c9c4b6ff73c35dccb5f130cb1c9c95725
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 8 12:32:38 2012 +0300

    Bin accidental duplicate library reference
    
    Change-Id: I5bd94b85ced0c675f4de270205c696292ac71062

diff --git a/android/experimental/LibreOffice4Android/project.properties b/android/experimental/LibreOffice4Android/project.properties
index 84e99a7..fc22b7f 100644
--- a/android/experimental/LibreOffice4Android/project.properties
+++ b/android/experimental/LibreOffice4Android/project.properties
@@ -12,5 +12,6 @@ target=android-14
 
 # Use the Bootstrap class
 android.library.reference.1=../../Bootstrap
+
+# Use the ActionBarSherlock library (Apache licensed)
 android.library.reference.2=../../abs-lib
-android.library.reference.3=../../abs-lib