From 42422f2599220b678aa41c4aadeec28df113c3ec Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 15 Feb 2012 16:36:31 +0200
Subject: Merge sal_textenc into sal just on Android

---
 sal/Module_sal.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sal/Module_sal.mk')

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 7a3304a220dd..d9b5ffbd4b28 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
-	$(if $(filter TRUE,$(MERGELIBS)),, \
+	$(if $(filter $(OS),ANDROID),, \
 		Library_sal_textenc) \
 	$(if $(filter $(OS),WNT), \
 		Library_uwinapi) \
-- 
cgit