diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 18:21:11 +0100 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-16 11:17:08 +0100 |
commit | bd1868c1057f0582f1a733bb90eca0c1c7e07933 (patch) | |
tree | ae3a4d96c7344895df0f2a049358283a0a948bdb /RepositoryExternal.mk | |
parent | 48cb441fceab83a6320dc871f291dcb313696650 (diff) |
Refactor Library_sal_textenc build condition
... by adding and using gb_CondSalTextEncodingLibrary.
Change-Id: I04e8f56bde6296477d449f1c447e8133cdf86e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126788
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5569aa0f1027..e24e35150713 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3800,7 +3800,7 @@ endif # SYSTEM_JFREEREPORT define gb_Executable__register_bestreversemap $(call gb_Executable_add_runtime_dependencies,bestreversemap,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target_for_build,sal_textenc))) \ + $(call gb_CondSalTextEncodingLibrary,$(call gb_Library_get_target_for_build,sal_textenc)) \ ) endef @@ -3817,7 +3817,7 @@ endef define gb_Executable__register_cppumaker $(call gb_Executable_add_runtime_dependencies,cppumaker,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ + $(call gb_CondSalTextEncodingLibrary,$(call gb_Library_get_target,sal_textenc)) \ ) endef |