Don't bother with a separate libsal_textenc when merging libs

android/qa/sc/Makefile

@@ -91,7 +91,6 @@ copy-stuff:
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  sal_textenc \
 		  saxlo \
 		  sclo \
 		  scfiltlo \

sal/Library_sal.mk

@@ -132,6 +132,23 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
+ifeq ($(MERGELIBS),TRUE)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/textenc/context \
+	sal/textenc/convertbig5hkscs \
+	sal/textenc/converteuctw \
+	sal/textenc/convertgb18030 \
+	sal/textenc/convertiso2022cn \
+	sal/textenc/convertiso2022jp \
+	sal/textenc/convertiso2022kr \
+	sal/textenc/convertsinglebytetobmpunicode \
+	sal/textenc/tables \
+	sal/textenc/tcvtbyte \
+	sal/textenc/tcvtmb \
+	sal/textenc/tcvtutf7 \
+))
+endif
+
 ifeq ($(GUI),UNX)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/conditn \

sal/Module_sal.mk

@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
-	Library_sal_textenc \
+	$(if $(filter TRUE,$(MERGELIBS)),, \
+		Library_sal_textenc) \
 	$(if $(filter $(OS),WNT), \
 		Library_uwinapi) \
 	Package_inc \

sal/textenc/textenc.cxx

@@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData
 
 namespace {
 
-#if defined IOS
+#if defined IOS || defined LIBO_MERGELIBS
 
 extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
     rtl_TextEncoding); // from tables.cxx in sal_textenc library