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 /solenv | |
| parent | 23461fcf801a8217e7eeefa93c44ec18c7a73088 (diff) | |
merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 |
1 files changed, 8 insertions, 2 deletions
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: |