[Libreoffice-commits] .: sal/Library_sal.mk sal/Module_sal.mk sal/textenc

[Tor Lillqvist]

 sal/Library_sal.mk      |    2 +-
 sal/Module_sal.mk       |    2 +-
 sal/textenc/textenc.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 42422f2599220b678aa41c4aadeec28df113c3ec
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Feb 15 16:36:31 2012 +0200

    Merge sal_textenc into sal just on Android

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 13a514f..60ab9c9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -132,7 +132,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
-ifeq ($(MERGELIBS),TRUE)
+ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/textenc/context \
 	sal/textenc/convertbig5hkscs \
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 7a3304a..d9b5ffb 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) \
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index b668492..42f1711 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData
 
 namespace {
 
-#if defined IOS || defined LIBO_MERGELIBS
+#if defined IOS || defined ANDROID
 
 extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
     rtl_TextEncoding); // from tables.cxx in sal_textenc library