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/Library_sal.mk | |
| parent | 4c8307053e3003af6cef5056e36a650f19c8cdb3 (diff) | |
Merge sal_textenc into sal just on Android
Diffstat (limited to 'sal/Library_sal.mk')
| -rw-r--r-- | sal/Library_sal.mk | 2 |
1 files changed, 1 insertions, 1 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 \ |