From b01f9cd3423d0ff85b84480c1a1336ea9ae6fd9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Fri, 18 May 2012 09:54:55 +0200 Subject: [PATCH] merge more libraries for android Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f --- android/experimental/DocumentLoader/Makefile | 1 - android/qa/desktop/Makefile | 1 - android/qa/sc/Makefile | 1 - solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 ++++++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 63fefa7..f5a946f 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -59,7 +59,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 7a15bf5..e74a406 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -118,7 +118,6 @@ copy-stuff: buildrcs cppcanvaslo \ drawinglayerlo \ expwrap.uno \ - fileacc \ fontconfig \ forlo \ foruilo \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 6600381..ed623f8 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -65,7 +65,6 @@ copy-stuff: datelo \ expwrap.uno \ fastsax.uno \ - fileacc \ fontconfig \ forlo \ foruilo \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3bcab1a..049de51 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 \ @@ -58,6 +56,14 @@ gb_MERGEDLIBS := \ xcr \ xo \ +ifeq ($(OS),ANDROID) +gb_MERGEDLIBS += \ + fileacc \ + fwl \ + fwm \ + +endif + endif # vim: set noet sw=4 ts=4: -- 1.7.9.5