summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-08-23 22:23:33 +0300
committerTor Lillqvist <tml@iki.fi>2012-08-23 22:26:01 +0300
commita1aed54fee058fdedb7d50b96291af701a327e57 (patch)
tree6905adb5b1612dbbeced9e28dbb4010b0a9b9120 /Library_merged.mk
parent0d2ed78dad772e62ce8e50be95e445a86742ab9b (diff)
Build basebmp as a static library for Android
Reduces shared library count by one... This is tedious. Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 1ac02e5d9c26..b7935444c249 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -123,8 +123,11 @@ $(eval $(call gb_Library_use_externals,merged,\
endif
ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,merged,\
+$(eval $(call gb_Library_use_static_libraries,merged,\
basebmp \
+))
+
+$(eval $(call gb_Library_use_libraries,merged,\
libotouch \
))