[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile      |   18 +++++++++---------
 android/experimental/LibreOffice4Android/Makefile |   18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 6db1f5f4c62afc644d59c9cada59cd483b4c7653
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 25 14:21:28 2013 +0300

    Fix fallout from 30fc3d6cff15ceabea6e1f9c4683cd383c322d72
    
    Change-Id: If97dc13e63986a7c9534f46673cfa8541893269a

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 63104dd..1aa743b 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -113,15 +113,15 @@ build-ant: android_version_setup copy-stuff link-so properties
 #
 # Copy jar files we need
 #
-	for F in $(strip \
-		   java_uno \
-		   juh \
-		   jurt \
-		   ridl \
-		   unoil \
-		   unoloader \
-		  ); do \
-	    $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+	for F in java_uno \
+		 juh \
+		 jurt \
+		 ridl \
+		 unoloader; do \
+	    $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \
+	done
+	for F in unoil; do \
+	    $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
 	done
 #
 	unset JAVA_HOME && $(ANT) -quiet debug
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index ee3325d..e15d30b 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -116,15 +116,15 @@ build-ant: android_version_setup copy-stuff link-so properties
 #
 # Copy jar files we need
 #
-	for F in $(strip \
-		   java_uno \
-		   juh \
-		   jurt \
-		   ridl \
-		   unoil \
-		   unoloader \
-		  ); do \
-	    $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+	for F in java_uno \
+		 juh \
+		 jurt \
+		 ridl \
+		 unoloader; do \
+	    $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \
+	done
+	for F in unoil; do \
+	    $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
 	done
 #
 	unset JAVA_HOME && $(ANT) -quiet debug