ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

this textenc hack is for android and disable-dynamic-loading

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2016-12-19 12:35:41 +00:00
parent 406a08c8a1
commit 002a83fca9
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
+2 -2
View File
@@ -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
sal/Library_sal.mk
+10 -2
View File
@@ -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
sal/Module_sal.mk
+1 -2
View File
@@ -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) \
))