[Libreoffice-commits] core.git: external/breakpad RepositoryExternal.mk

Markus Mohrhard markus.mohrhard at googlemail.com
Tue Jun 14 12:04:50 UTC 2016


 RepositoryExternal.mk                         |    4 ----
 external/breakpad/ExternalPackage_breakpad.mk |   20 --------------------
 external/breakpad/Module_breakpad.mk          |    1 -
 3 files changed, 25 deletions(-)

New commits:
commit 4b2b496901ac765c4581a191a37a1731c0b87f99
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 13 01:20:08 2016 +0200

    we are using our own minidump_upload executable
    
    Change-Id: Icee770ff8e2db019031d618528a9aab83041389d
    Reviewed-on: https://gerrit.libreoffice.org/26244
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 563c0d4..62d3bfd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3342,10 +3342,6 @@ $(call gb_LinkTarget_use_external_project,$(1),breakpad)
 
 endef
 
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-	breakpad \
-))
-
 endif # ENABLE_BREAKPAD
 
 ifeq ($(ENABLE_GLTF),TRUE)
diff --git a/external/breakpad/ExternalPackage_breakpad.mk b/external/breakpad/ExternalPackage_breakpad.mk
deleted file mode 100644
index 6c0d0bf..0000000
--- a/external/breakpad/ExternalPackage_breakpad.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,breakpad,breakpad))
-
-$(eval $(call gb_ExternalPackage_use_external_project,breakpad,breakpad))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_ExternalPackage_add_file,breakpad,$(LIBO_LIB_FOLDER)/minidump_upload,src/tools/linux/symupload/minidump_upload))
-else ifeq ($(OS)),WNT)
-$(eval $(call gb_ExternalPackage_add_file,breakpad,$(LIBO_LIB_FOLDER)/minidump_upload,src/tools/linux/symupload/minidump_upload))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/breakpad/Module_breakpad.mk b/external/breakpad/Module_breakpad.mk
index 6cc740a..be91053 100644
--- a/external/breakpad/Module_breakpad.mk
+++ b/external/breakpad/Module_breakpad.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,breakpad))
 
 $(eval $(call gb_Module_add_targets,breakpad,\
 	UnpackedTarball_breakpad \
-	ExternalPackage_breakpad \
 ))
 
 ifneq ($(OS)$(COM),WNTMSC)


More information about the Libreoffice-commits mailing list