diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-12-03 02:44:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-03 02:44:46 +0000 |
| commit | 6045c9ab329d69773f27498568b7bed8bbf08ff8 (patch) | |
| tree | da38f43d0e0181d0f76dd1bbe46047c62ecbc77c | |
| parent | 62070ac9a1c2671a38e37122b4407b9d5a7ce1a6 (diff) | |
| parent | e3a650a5b332875f8c6a8aca9b54598442b40a4b (diff) | |
| download | art-6045c9ab329d69773f27498568b7bed8bbf08ff8.zip art-6045c9ab329d69773f27498568b7bed8bbf08ff8.tar.gz art-6045c9ab329d69773f27498568b7bed8bbf08ff8.tar.bz2 | |
Merge "Fix mac build"
| -rw-r--r-- | dex2oat/dex2oat.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index d957d27..a1ac2f0 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -21,11 +21,14 @@ #include <fstream> #include <iostream> -#include <malloc.h> // For mallinfo #include <sstream> #include <string> #include <vector> +#ifndef __APPLE__ +#include <malloc.h> // For mallinfo +#endif + #if defined(__linux__) && defined(__arm__) #include <sys/personality.h> #include <sys/utsname.h> |