diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 12:33:50 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:33 +0100 |
| commit | 134296dc6651240e6cff8e37eb9c9b39d173f98c (patch) | |
| tree | ea11b27508c568c3311171ec6d188fb28b41eaac /android | |
| parent | fae6b381ab40042f05a7becccda09e119e23c8a6 (diff) | |
| download | external_chromium-134296dc6651240e6cff8e37eb9c9b39d173f98c.zip external_chromium-134296dc6651240e6cff8e37eb9c9b39d173f98c.tar.gz external_chromium-134296dc6651240e6cff8e37eb9c9b39d173f98c.tar.bz2 | |
Merge Chromium at 10.0.634.0: Fix link errors
Several files are now including execinfo.h,
just declaring the functions in the header
and implementing them in execinfo.cc.
Change-Id: Id566e12b8068ea2dfacdb9fbf4eff6d2efd617b7
Diffstat (limited to 'android')
| -rw-r--r-- | android/execinfo.cc | 13 | ||||
| -rw-r--r-- | android/execinfo.h | 10 |
2 files changed, 20 insertions, 3 deletions
diff --git a/android/execinfo.cc b/android/execinfo.cc new file mode 100644 index 0000000..b2e0e66 --- /dev/null +++ b/android/execinfo.cc @@ -0,0 +1,13 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "execinfo.h" + +int backtrace(void **array, int size) { return 0; } + +char **backtrace_symbols(void *const *array, int size) { return 0; } + +void backtrace_symbols_fd (void *const *array, int size, int fd) {} + + diff --git a/android/execinfo.h b/android/execinfo.h index 98bf4c9..b0d9836 100644 --- a/android/execinfo.h +++ b/android/execinfo.h @@ -1,10 +1,14 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + #ifndef FAKE_EXECINFO_H #define FAKE_EXECINFO_H -int backtrace(void **array, int size) { return 0; } +int backtrace(void **array, int size); -char **backtrace_symbols(void *const *array, int size) { return 0; } +char **backtrace_symbols(void *const *array, int size); -void backtrace_symbols_fd (void *const *array, int size, int fd) {} +void backtrace_symbols_fd (void *const *array, int size, int fd); #endif |