diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-12-22 11:22:54 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2017-12-23 13:21:00 +0000 |
| commit | 9bcfabcaa75750fe01d97351941fb1d45e7e8722 (patch) | |
| tree | e6653aeb1ab76c6b4cf02e27d785feb6706c0089 /src | |
| parent | Fix minidump on ChromeOS (diff) | |
| download | breakpad-9bcfabcaa75750fe01d97351941fb1d45e7e8722.tar.xz | |
android: drop sgidefs.h hack for LSS
Breakpad shouldn't be hacking up headers for LSS. This was eventually
fixed in LSS directly in https://codereview.chromium.org/1248033002, so
we can drop this hack on our side.
Change-Id: Iff29efe7f6af40835e0aab1f6ac3fd8d167045ef
Reviewed-on: https://chromium-review.googlesource.com/843124
Reviewed-by: Mark Seaborn <mseaborn@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/android/include/sgidefs.h | 41 | ||||
| -rw-r--r-- | src/common/common.gyp | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/src/common/android/include/sgidefs.h b/src/common/android/include/sgidefs.h deleted file mode 100644 index 33796dcf..00000000 --- a/src/common/android/include/sgidefs.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2013, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_SGIDEFS_H -#define GOOGLE_BREAKPAD_ANDROID_INCLUDE_SGIDEFS_H - -#ifdef __mips__ - -// Android doesn't contain sgidefs.h, but does have <asm/sgidefs.h> which -// contains what we need. -#include <asm/sgidefs.h> - -#endif // __mips__ - -#endif // GOOGLE_BREAKPAD_ANDROID_INCLUDE_SGIDEFS_H diff --git a/src/common/common.gyp b/src/common/common.gyp index e2ea4007..cd05afd5 100644 --- a/src/common/common.gyp +++ b/src/common/common.gyp @@ -50,7 +50,6 @@ 'android/breakpad_getcontext.S', 'android/include/elf.h', 'android/include/link.h', - 'android/include/sgidefs.h', 'android/include/stab.h', 'android/include/sys/procfs.h', 'android/include/sys/signal.h', |