diff options
| author | Hans Boehm <hboehm@google.com> | 2018-12-13 18:41:17 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-13 18:41:17 -0800 |
| commit | 2d1db36fbe137c5e38cb15cb7c44de25f718ca45 (patch) | |
| tree | 64f09ef19c05eb9438ce919145daae4e594143b2 | |
| parent | e9a24fb73b91921a0959e8265f7d748b1269919c (diff) | |
| parent | 7ca98bfba8139c17f2e453aa1a033e8ed7074391 (diff) | |
Merge "Don't include malloc.h on MacOS"
am: 7ca98bfba8
Change-Id: Ib0859b0728a3ce2dfae3e08be0025730c7a4bfce
| -rw-r--r-- | runtime/gc/heap.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 77254ce8b8..f2c924ab36 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -17,7 +17,9 @@ #include "heap.h" #include <limits> +#if defined(__BIONIC__) || defined(__GLIBC__) #include <malloc.h> // For mallinfo() +#endif #include <memory> #include <vector> |