diff options
| -rw-r--r-- | Library_merged.mk | 14 | ||||
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 3 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 6 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 6 | ||||
| -rw-r--r-- | android/qa/sc/Makefile | 3 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
6 files changed, 20 insertions, 18 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 1a5b6c39c917..2a53b609b32b 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -54,6 +54,20 @@ $(eval $(call gb_Library_use_externals,merged,\ zlib \ )) +# This would be needed on all platforms but only on android we merge libraries from lingucomponent +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_use_externals,merged,\ + hunspell \ +)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + ulingu \ +)) +$(eval $(call gb_Library_add_libs,merged,\ + $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \ + $(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \ +)) +endif + ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ graphite \ diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 9a8fb4413f64..1253992361a2 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -62,8 +62,6 @@ copy-stuff: evtattlo \ expwrap.uno \ fastsax.uno \ - forlo \ - foruilo \ frmlo \ gcc3_uno \ hwplo \ @@ -120,7 +118,6 @@ copy-stuff: xmlreader \ xmlsecurity \ xslt \ - xstor \ ); do \ $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \ done diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index a784f12728d8..20253ac1b50c 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -35,12 +35,9 @@ copy-stuff: evtattlo \ expwrap.uno \ fastsax.uno \ - forlo \ - foruilo \ frmlo \ gcc3_uno \ hwplo \ - hyphenlo \ i18nisolang1gcc3 \ icudatalo \ icui18nlo \ @@ -53,7 +50,6 @@ copy-stuff: jvmaccessgcc3 \ jvmfwk \ libotouchlo \ - lnthlo \ lo-bootstrap \ localedata_en \ localedata_es \ @@ -73,7 +69,6 @@ copy-stuff: sdlo \ sddlo \ smdlo \ - spelllo \ stocservices.uno \ store \ svgfilterlo \ @@ -102,7 +97,6 @@ copy-stuff: xmlsecurity \ xoflo \ xslt \ - xstor \ ); do \ $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \ done diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 5e74d68626df..3adc9ee50c68 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -98,10 +98,7 @@ copy-stuff: buildrcs cppcanvaslo \ embobj \ expwrap.uno \ - forlo \ - foruilo \ gcc3_uno \ - hyphenlo \ i18nisolang1gcc3 \ icudatalo \ icui18nlo \ @@ -111,7 +108,6 @@ copy-stuff: buildrcs jvmfwk \ libotouchlo \ introspection.uno \ - lnthlo \ localedata_en \ localedata_es \ localedata_euro \ @@ -121,7 +117,6 @@ copy-stuff: buildrcs ooxlo \ reflection.uno \ reg \ - spelllo \ stocservices.uno \ store \ test \ @@ -139,7 +134,6 @@ copy-stuff: buildrcs xmlreader \ xmlsecurity \ xslt \ - xstor \ \ swlo \ swuilo \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 3cc0a6404f83..5c2de6606419 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -67,8 +67,6 @@ copy-stuff: datelo \ expwrap.uno \ fastsax.uno \ - forlo \ - foruilo \ frmlo \ gcc3_uno \ i18nisolang1gcc3 \ @@ -106,7 +104,6 @@ copy-stuff: vbahelperlo \ xml2 \ xmlreader \ - xstor \ ); do \ $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \ done diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3fe296b609a6..5b2f6a86c9df 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -71,8 +71,14 @@ gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) ifeq ($(OS),ANDROID) gb_MERGEDLIBS += \ fileacc \ + for \ + forui \ fwl \ fwm \ + hyphen \ + lnth \ + spell \ + xstor \ endif |