diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-25 14:21:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-25 14:21:39 +0300 |
| commit | 6db1f5f4c62afc644d59c9cada59cd483b4c7653 (patch) | |
| tree | c9099170bd4bb86ed4c7af9b9fb2a032b489ff60 /android | |
| parent | b2235e49d42cdd10603b33e2708c1449eadfbfbe (diff) | |
Fix fallout from 30fc3d6cff15ceabea6e1f9c4683cd383c322d72
Change-Id: If97dc13e63986a7c9534f46673cfa8541893269a
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 18 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 63104dd27b50..1aa743bb4667 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 ee3325d2fa44..e15d30bd5f28 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 |