diff options
| author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-10-09 17:15:06 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-10-09 17:15:06 +0000 |
| commit | b52be69e590ac13f30d104cb713cc31348547523 (patch) | |
| tree | 39154b23dd962d08b3f31d6c64b278de9378251d /Makefile.am | |
| parent | Don't bail if a thread's stack pointer is invalid (diff) | |
| download | breakpad-b52be69e590ac13f30d104cb713cc31348547523.tar.xz | |
Fix the Android unit tests.
- One of the unit test binaries refused to link due to
missing linker flags.
- The WriteDSODebug() function now works on Android, so
do not special-case it anymore.
- Ensure android/run-checks.sh will complain properly if
the client unit test suite fails on Android. It used to
consider that such failures were acceptable. Note that
it still considers failures when running the tools and
processor test suite on the device normal (fixing this
is a lot harder, and these parts of Breakpad typically
never run on a device, but on the host).
Review URL: https://breakpad.appspot.com/482002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1066 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7eefdd5e..83c29da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -388,7 +388,7 @@ if ANDROID_HOST src_client_linux_linux_client_unittest_shlib_SOURCES += \ src/common/android/breakpad_getcontext_unittest.cc src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ - -llog + -llog -lm endif src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \ @@ -399,6 +399,10 @@ src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \ src_client_linux_linux_client_unittest_SOURCES = src_client_linux_linux_client_unittest_LDFLAGS = \ -Wl,-rpath,'$$ORIGIN' +if ANDROID_HOST +src_client_linux_linux_client_unittest_LDFLAGS += \ + -llog +endif src_client_linux_linux_client_unittest_LDADD = \ src/client/linux/linux_client_unittest_shlib |