commit e3a650a5b332875f8c6a8aca9b54598442b40a4b
author Mathieu Chartier <mathieuc@google.com> Tue Dec 02 18:23:21 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Dec 02 18:44:15 2014 -0800
tree da38f43d0e0181d0f76dd1bbe46047c62ecbc77c
parent 62070ac9a1c2671a38e37122b4407b9d5a7ce1a6

Fix mac build

Macs don't have malloc.h, hopefully this fixes the build.

(cherry picked from commit 6cc5076a1248582cf16bd9a6a1719e0a4c1a1de2)

Change-Id: I94d10d2c3d16893625df210bdd5587eea4a1247f

dex2oat/dex2oat.cc

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>