Need deployment component too when HAVE_FEATURE_EXTENSIONS

Don't look just at DESKTOP or not when deciding whether to compile that stuff.

Change-Id: Ic9961ba27eb4a1e9360c67dd844c9243f1eff00e

4 files changed, 15 insertions, 11 deletions

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 6678e2590ca3..1ffa6153d8b1 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include "osl/diagnose.h"
 #include "osl/file.hxx"
@@ -352,11 +353,11 @@ Reference< XInterface > invokeComponentFactory(
     // It seems that the only UNO components that have
     // component_getImplementationEnvironment functions are the JDBC
     // and ADO (whatever that is) database connectivity thingies
-    // neither of which make sense on iOS (which is the only platform
-    // for which DISABLE_DYNLOADING is intended, really). So we can
-    // simoly bypass the getLibEnv() stuff and don't need to wonder
-    // how to find out what function to call at this point if
-    // statically linked.
+    // neither of which make sense on iOS and Android (which are the
+    // only platforms for which DISABLE_DYNLOADING is intended,
+    // really). So we can simply bypass the getLibEnv() stuff and
+    // don't need to wonder how to find out what function to call at
+    // this point if statically linked.
     aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 #else
     getLibEnv(lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix);
@@ -444,6 +445,9 @@ extern "C"
     extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+#if HAVE_FEATURE_EXTENSIONS
+    extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+#endif
     extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -553,6 +557,9 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
         { "stocservices.uno.a", stocservices_component_getFactory },
 #endif
         { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory },
+#if HAVE_FEATURE_EXTENSIONS
+        { "libdeployment.a", deployment_component_getFactory },
+#endif
         { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfwklo.a", fwk_component_getFactory },
         { "libpackage2.a", package2_component_getFactory },
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index a0256744f379..b378562a2400 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/
 
 $(eval $(call gb_Library_add_exception_objects,deployment,\
     desktop/source/deployment/dp_log \
+    desktop/source/deployment/dp_persmap \
     desktop/source/deployment/dp_services \
     desktop/source/deployment/dp_xml \
     desktop/source/deployment/manager/dp_activepackages \
@@ -91,10 +92,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\
     helplinker \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,deployment,\
-    desktop/source/deployment/dp_persmap \
-))
-
 endif
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a05cceba6c76..73bd2291b8ad 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     AllLangResTarget_deploymentgui \
     AllLangResTarget_dkt \
     Library_deployment \
+    Library_deploymentgui \
     Library_deploymentmisc \
     Library_offacc \
     Library_sofficeapp \
@@ -51,7 +52,6 @@ endif
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
     Executable_unopkg.bin \
-    Library_deploymentgui \
     Library_migrationoo2 \
     Library_migrationoo3 \
     Library_unopkgapp \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 805a1e805f1f..62103a0e15dd 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	configmgr/source/configmgr \
 	cppcanvas/source/uno/mtfrenderer \
 	cui/util/cui \
+	desktop/source/deployment/deployment \
 	drawinglayer/drawinglayer \
 	dtrans/util/mcnttype \
 	embeddedobj/util/embobj \
@@ -269,7 +270,6 @@ endif # DBCONNECTIVITY
 ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Rdb_add_components,services,\
-	desktop/source/deployment/deployment \
 	desktop/source/deployment/gui/deploymentgui \
 	desktop/source/migration/services/migrationoo2 \
 	desktop/source/migration/services/migrationoo3 \