diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:36:31 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:40:00 +0200 |
| commit | 42422f2599220b678aa41c4aadeec28df113c3ec (patch) | |
| tree | 19bd879d5fde2f6ffc63a1263e7e07221364ec4b /sal | |
| parent | 4c8307053e3003af6cef5056e36a650f19c8cdb3 (diff) | |
Merge sal_textenc into sal just on Android
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 2 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 2 | ||||
| -rw-r--r-- | sal/textenc/textenc.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 13a514f33f7c..60ab9c9a69c4 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 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) \ diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index b6684928998d..42f1711ecc87 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 |