summaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-03 00:39:55 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-06 01:58:53 +0000
commit5531b23c1546fdf896db25f7412291bada6e723c (patch)
tree5b665c603526fd25e5a7d59827dc815e128b2939 /vm
parent9003fb0f7b8a0c9375e9096871d081ada497859d (diff)
downloadandroid_dalvik-5531b23c1546fdf896db25f7412291bada6e723c.tar.gz
android_dalvik-5531b23c1546fdf896db25f7412291bada6e723c.tar.bz2
android_dalvik-5531b23c1546fdf896db25f7412291bada6e723c.zip
Unbreak building host modules
bionic is now a dependency for properties Change-Id: Icd406e639ca297244ab809f523c6830c2240d20b
Diffstat (limited to 'vm')
-rw-r--r--vm/alloc/Heap.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/vm/alloc/Heap.cpp b/vm/alloc/Heap.cpp
index 5f860790c..c11ff79dd 100644
--- a/vm/alloc/Heap.cpp
+++ b/vm/alloc/Heap.cpp
@@ -37,6 +37,7 @@
#include <errno.h>
#include <cutils/trace.h>
+#ifdef __BIONIC__
#include <cutils/properties.h>
static int debugalloc()
@@ -45,6 +46,9 @@ static int debugalloc()
property_get("dalvik.vm.debug.alloc", value, "0");
return atoi(value);
}
+#else
+inline static int debugalloc() { return 1; }
+#endif
static const GcSpec kGcForMallocSpec = {
true, /* isPartial */