diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-17 00:17:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-17 00:17:51 +0000 |
| commit | e0b553c6a8733b0569b9fa228f623da904ff649e (patch) | |
| tree | b858a9b0ca4a26adee7c9f3394e52f5ae32541b2 | |
| parent | 9932525b96dcdadcd3bf56cd5bbe91081c734be2 (diff) | |
| parent | 6609d6fb4348b476ffb1fe193ceab5cdd89847ac (diff) | |
| download | llvm-e0b553c6a8733b0569b9fa228f623da904ff649e.tar.gz | |
Merge "Fixes for host bionic support"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: 6609d6fb43
Change-Id: I89e3e5869658a9c5c198f0e55c94a33b706da444
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | host/include/llvm/Config/config.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 0302e6593017..a29a38a3c184 100644 --- a/Android.bp +++ b/Android.bp @@ -100,6 +100,9 @@ cc_library_headers { host: { export_include_dirs: ["host/include"], }, + linux_bionic: { + enabled: true, + }, windows: { enabled: true, }, diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index 408b8a5c5aa5..9563335abbd7 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -115,7 +115,9 @@ #define HAVE_ERROR_T 1 /* Define to 1 if you have the <execinfo.h> header file. */ +#ifndef __BIONIC__ #define HAVE_EXECINFO_H 1 +#endif /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 @@ -309,7 +311,9 @@ #define HAVE_OPENDIR 1 /* Define to 1 if you have the `posix_spawn' function. */ +#ifndef __BIONIC__ #define HAVE_POSIX_SPAWN 1 +#endif /* Define to 1 if you have the `powf' function. */ #define HAVE_POWF 1 @@ -485,7 +489,9 @@ #define HAVE_SYS_WAIT_H 1 /* Define if the setupterm() function is supported this platform. */ +#ifndef __BIONIC__ #define HAVE_TERMINFO 1 +#endif /* Define to 1 if you have the <termios.h> header file. */ #define HAVE_TERMIOS_H 1 |