[Libreoffice-commits] core.git: RepositoryExternal.mk sal/Library_sal.mk sal/Module_sal.mk

[Caolán McNamara]

 RepositoryExternal.mk |    4 ++--
 sal/Library_sal.mk    |   12 ++++++++++--
 sal/Module_sal.mk     |    3 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 002a83fca94dd34cc30a58162c3316e371478308
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 15 10:15:59 2016 +0000

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d5c5aa..4b21b93 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 868dea4..4bf9021 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 46ca260..668ee20 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) \
 ))