commit 0da35005894342721ed57888cad09ee73c1c157b
author rockot <rockot@chromium.org> Thu Sep 17 19:28:46 2015
committer Commit bot <commit-bot@chromium.org> Thu Sep 17 19:30:05 2015
tree 7f10f533d8fc2155618f05b9ee24fff6e9227e63
parent de35ee24b0916e5d12389056435d003fa969a58d

Restore missing HEAP_PROFILE definitions

These were unintentionally removed by
https://crrev.com/5747a19cad8feb463125f3c80376d3c535f25523
and are still needed for builds with profiling enabled.

R=thakis@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1344373003

Cr-Original-Commit-Position: refs/heads/master@{#349467}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2f830359d1735966e8a2fe2b63bd0912b2cea58b

src/heap-profiler.cc

diff --git a/src/heap-profiler.cc b/src/heap-profiler.cc
index 43a6f35..693023a 100644
--- a/src/heap-profiler.cc
+++ b/src/heap-profiler.cc
@@ -80,6 +80,32 @@
 #endif
 #endif
 
+#if defined(__ANDROID__) || defined(ANDROID)
+// On android, there are no environment variables.
+// Instead, we use system properties, set via:
+//   adb shell setprop prop_name prop_value
+// From <sys/system_properties.h>,
+//   PROP_NAME_MAX   32
+//   PROP_VALUE_MAX  92
+#define HEAPPROFILE "heapprof"
+#define HEAP_PROFILE_ALLOCATION_INTERVAL "heapprof.allocation_interval"
+#define HEAP_PROFILE_DEALLOCATION_INTERVAL "heapprof.deallocation_interval"
+#define HEAP_PROFILE_INUSE_INTERVAL "heapprof.inuse_interval"
+#define HEAP_PROFILE_TIME_INTERVAL "heapprof.time_interval"
+#define HEAP_PROFILE_MMAP_LOG "heapprof.mmap_log"
+#define HEAP_PROFILE_MMAP "heapprof.mmap"
+#define HEAP_PROFILE_ONLY_MMAP "heapprof.only_mmap"
+#else  // defined(__ANDROID__) || defined(ANDROID)
+#define HEAPPROFILE "HEAPPROFILE"
+#define HEAP_PROFILE_ALLOCATION_INTERVAL "HEAP_PROFILE_ALLOCATION_INTERVAL"
+#define HEAP_PROFILE_DEALLOCATION_INTERVAL "HEAP_PROFILE_DEALLOCATION_INTERVAL"
+#define HEAP_PROFILE_INUSE_INTERVAL "HEAP_PROFILE_INUSE_INTERVAL"
+#define HEAP_PROFILE_TIME_INTERVAL "HEAP_PROFILE_TIME_INTERVAL"
+#define HEAP_PROFILE_MMAP_LOG "HEAP_PROFILE_MMAP_LOG"
+#define HEAP_PROFILE_MMAP "HEAP_PROFILE_MMAP"
+#define HEAP_PROFILE_ONLY_MMAP "HEAP_PROFILE_ONLY_MMAP"
+#endif  // defined(__ANDROID__) || defined(ANDROID)
+
 using STL_NAMESPACE::string;
 using STL_NAMESPACE::sort;