From 98df76f26a808940935f1218586443e0d9328d0d Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 26 Nov 2015 00:15:27 +0100 Subject: use the new ini file based minidump uploader Change-Id: Iaf85fb53e6eff34e268b6948d62ca84b7f8e6dd2 Reviewed-on: https://gerrit.libreoffice.org/22558 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- desktop/Library_sofficeapp.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'desktop/Library_sofficeapp.mk') diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 99fa9795efee..d24f6156d20c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -25,6 +25,10 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ $(eval $(call gb_Library_use_external,sofficeapp,boost_headers)) +ifeq ($(ENABLE_BREAKPAD),TRUE) +$(eval $(call gb_Library_use_external,sofficeapp,breakpad)) +endif + $(eval $(call gb_Library_use_custom_headers,sofficeapp,\ officecfg/registry \ )) @@ -44,6 +48,9 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ comphelper \ cppu \ cppuhelper \ + $(if $(filter TRUE,$(ENABLE_BREAKPAD)), \ + crashreport \ + ) \ deploymentmisc \ editeng \ i18nlangtag \ @@ -86,7 +93,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/app/check_ext_deps \ desktop/source/app/cmdlineargs \ desktop/source/app/cmdlinehelp \ - desktop/source/app/crashreport \ desktop/source/app/desktopcontext \ desktop/source/app/desktopresid \ desktop/source/app/dispatchwatcher \ @@ -117,10 +123,6 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ endif endif -ifeq ($(ENABLE_BREAKPAD),TRUE) -$(eval $(call gb_Library_use_external,sofficeapp,breakpad)) -endif - # LibreOfficeKit bits ifneq ($(filter $(OS),ANDROID IOS MACOSX WNT),) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ -- cgit