diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-11-22 23:08:06 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-05 22:19:27 +0200 |
| commit | db3cbdf116d35782c49e22b1db32dead4e95b148 (patch) | |
| tree | 2f79828cab78eca7c22c38f6cb435b86d16758ae /sal/android | |
| parent | 133af7066e671fbb2feb0016dac9305d291d7d90 (diff) | |
android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it
arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later
Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sal/android')
| -rw-r--r-- | sal/android/lo-bootstrap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index 7a2da48eb93b..d1ecd810ab19 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -37,6 +37,11 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) +// TODO: workaround for unified headers migration - only made available when +// __USE_BSD or __BIONIC__ are defined, so just add those here... +#define letoh16(x) (x) +#define letoh32(x) (x) + struct engine { int dummy; }; |