summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-19 20:56:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-20 09:43:28 +0000
commit4ebe24910441e7f382cff4ccc899515910c74c2c (patch)
tree5aa56197779b7038a4fa41423d976f6c7b4c9c78 /solenv
parent62ea0ef8428ca4e12c5fa11674737a9bf0b646aa (diff)
drop basebmp entirely now
Change-Id: I534848c4be8eadf86b7f31ac742a80982405f56f
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 4ad27fb805ee..cd2a0df01779 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -11,7 +11,6 @@
# we link all object files from these libraries into one, merged library
MERGE_LIBRARY_LIST := \
avmedia \
- $(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \
canvastools \
comphelper \