diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-28 14:31:39 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-24 17:00:20 +0300 |
| commit | 25d61bd3ddcd7400192d0669b1d9ebfaaa13004c (patch) | |
| tree | dc103fb9cd3b992ccf210d9a6e8495628aa6bd39 | |
| parent | e8037c7074dce14cd31c93d2f8c5d07a3a753a0c (diff) | |
Make the faulty.lib code actually compile and link
Change-Id: I81614321ef29bff647c7c4e4b356d5f115ccb3f3
| -rw-r--r-- | sal/Library_lo-bootstrap.mk | 3 | ||||
| -rw-r--r-- | sal/android/faulty.lib/mozilla/Assertions.h | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index b799192604e1..79ebd90760ad 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,lo-bootstrap)) # We explicitly *don't* want gb_STDLIBS to be linked here $(eval $(call gb_Library_add_libs,lo-bootstrap,\ + -lz \ -llog \ -landroid \ + -lgnustl_static \ )) $(eval $(call gb_Library_add_cobjects,lo-bootstrap,\ @@ -49,6 +51,7 @@ $(eval $(call gb_Library_set_include,lo-bootstrap,\ $$(INCLUDE) \ -I$(SRCDIR)/sal/android/faulty.lib \ -I$(SRCDIR)/sal/inc \ + -DHAVE_DLADDR \ )) # vim: set noet sw=4 ts=4: diff --git a/sal/android/faulty.lib/mozilla/Assertions.h b/sal/android/faulty.lib/mozilla/Assertions.h index 407fb24e98d1..20e09cb89530 100644 --- a/sal/android/faulty.lib/mozilla/Assertions.h +++ b/sal/android/faulty.lib/mozilla/Assertions.h @@ -8,6 +8,19 @@ #ifndef mozilla_Assertions_h_ #define mozilla_Assertions_h_ +// This header gets included early enough in all the faulty.lib code so make +// sure some warnings are just that. Mozilla apparetly doesn't like -Werror? + +#ifdef LIBO_WERROR +#pragma GCC diagnostic warning "-Wempty-body" +#pragma GCC diagnostic warning "-Wformat" +#pragma GCC diagnostic warning "-Wignored-qualifiers" +#pragma GCC diagnostic warning "-Wshadow" +#pragma GCC diagnostic warning "-Wsign-compare" +#pragma GCC diagnostic warning "-Wunused-parameter" +#pragma GCC diagnostic warning "-Wunused-variable" +#endif + #include "mozilla/Attributes.h" #include <stddef.h> |