| commit | 819685398050c5a380c14110409e4d53ac9c2cee | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Sat Jan 16 15:05:43 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jan 16 15:05:43 2021 +0000 |
| tree | 327bff51a0c5338234866768a516f01917139151 | |
| parent | e865d88531291f81e32f7231a55f20d2e243949f [diff] | |
| parent | 44448249023f8535c8e21c6369e1ac675cd21526 [diff] |
Merge "Fix macOS build."
diff --git a/libcutils/memory.cpp b/libcutils/memory.cpp index a899d80..5a410c2 100644 --- a/libcutils/memory.cpp +++ b/libcutils/memory.cpp
@@ -18,7 +18,9 @@ #include <log/log.h> +#if !defined(__APPLE__) #include <malloc.h> +#endif void process_disable_memory_mitigations() { bool success = false;