diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-12-15 10:15:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 12:35:41 +0000 |
commit | 002a83fca94dd34cc30a58162c3316e371478308 (patch) | |
tree | 13e2d4e38a2dc1e2eea5b52a138b2add6a3450cf /sal/Module_sal.mk | |
parent | 406a08c8a12dcaa6bf4a17ae3aa6d6d27bb10446 (diff) |
this textenc hack is for android and disable-dynamic-loading
Change-Id: If2191161e82fc1e05b1442ae4b3b729cc1b8994d
Reviewed-on: https://gerrit.libreoffice.org/32038
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal/Module_sal.mk')
-rw-r--r-- | sal/Module_sal.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 46ca260b6c5f..668ee209bc87 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -14,8 +14,7 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ - $(if $(filter $(OS),ANDROID),, \ - Library_sal_textenc) \ + $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \ $(if $(filter $(OS),WNT), \ Library_uwinapi) \ )) |