diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-18 09:54:55 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-13 01:48:57 +0200 |
| commit | 5f9774ed5fccfc3971736d899b11e24a8081442d (patch) | |
| tree | aef4bc79d53eacba759a08f1e2416c7e5f7a7246 | |
| parent | 23461fcf801a8217e7eeefa93c44ec18c7a73088 (diff) | |
merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 1 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 1 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 1 | ||||
| -rw-r--r-- | android/qa/sc/Makefile | 1 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 |
5 files changed, 8 insertions, 6 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 279f6a4a72a2..c7901a7cffdf 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -65,7 +65,6 @@ copy-stuff: evtattlo \ expwrap.uno \ fastsax.uno \ - fileacc \ forlo \ foruilo \ frmlo \ diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 1365407dd530..3a49c7dfe734 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -36,7 +36,6 @@ copy-stuff: evtattlo \ expwrap.uno \ fastsax.uno \ - fileacc \ forlo \ foruilo \ frmlo \ diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 799edc235354..7ad9ac0270dc 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -99,7 +99,6 @@ copy-stuff: buildrcs cppcanvaslo \ embobj \ expwrap.uno \ - fileacc \ forlo \ foruilo \ fsstorage.uno \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 3b92d3b67224..f3e47954c316 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -65,7 +65,6 @@ copy-stuff: datelo \ expwrap.uno \ fastsax.uno \ - fileacc \ forlo \ foruilo \ frmlo \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 7a0503993aae..fe75c36d7fec 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -40,8 +40,6 @@ gb_MERGEDLIBS := \ fwe \ fwi \ fwk \ - fwl \ - fwm \ lng \ package2 \ sb \ @@ -60,6 +58,14 @@ gb_MERGEDLIBS := \ gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) +ifeq ($(OS),ANDROID) +gb_MERGEDLIBS += \ + fileacc \ + fwl \ + fwm \ + +endif + endif # vim: set noet sw=4 ts=4: |