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 | |
| 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>
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 12 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3d5c5aa10c88..4b21b93b04f7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3742,7 +3742,7 @@ endif # SYSTEM_JFREEREPORT # FIXME: the library target should be for build too define gb_Executable__register_bestreversemap $(call gb_Executable_add_runtime_dependencies,bestreversemap,\ - $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \ + $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ ) endef @@ -3760,7 +3760,7 @@ endef define gb_Executable__register_cppumaker $(call gb_Executable_add_runtime_dependencies,cppumaker,\ - $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \ + $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ ) endef diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 868dea4a0f74..4bf9021e7ebe 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -126,8 +126,7 @@ $(eval $(call gb_Library_add_cxxflags,sal,\ )) endif -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_exception_objects,sal,\ +sal_textenc_code= \ sal/textenc/context \ sal/textenc/convertbig5hkscs \ sal/textenc/converteuctw \ @@ -141,6 +140,15 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/tcvtbyte \ sal/textenc/tcvtmb \ sal/textenc/tcvtutf7 \ + +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_exception_objects,sal,\ + $(sal_textenc_code) \ +)) +else ifeq ($(DISABLE_DYNLOADING),TRUE) + +$(eval $(call gb_Library_add_exception_objects,sal,\ + $(sal_textenc_code) \ )) endif 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) \ )) |