diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-13 01:20:08 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-20 00:41:07 +0000 |
| commit | a4b1f28bf7b059d5c10340c1417cc378ac66c2cc (patch) | |
| tree | 534b8590a444741b63dbdd7001246a760c74c9fe | |
| parent | Try to fix the crashreport with SaveToolbarController::modified (diff) | |
| download | core-a4b1f28bf7b059d5c10340c1417cc378ac66c2cc.tar.gz core-a4b1f28bf7b059d5c10340c1417cc378ac66c2cc.zip | |
we are using our own minidump_upload executable
Change-Id: Icee770ff8e2db019031d618528a9aab83041389d
Reviewed-on: https://gerrit.libreoffice.org/26244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 4b2b496901ac765c4581a191a37a1731c0b87f99)
Reviewed-on: https://gerrit.libreoffice.org/26490
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | external/breakpad/ExternalPackage_breakpad.mk | 20 | ||||
| -rw-r--r-- | external/breakpad/Module_breakpad.mk | 1 |
3 files changed, 0 insertions, 25 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8d03be3009e5..135cd7f63553 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 6c0d0bff2e21..000000000000 --- 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 6cc740aab460..be910538fd58 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) |