commit 68ead6495715c44c60e4faa27db8255e3ba7491b
author Josh Gao <jmgao@google.com> Tue Jan 05 19:38:33 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 05 19:38:33 2016 +0000
tree ffe1603c0c9024a831a5fae789bae67773cdb6d6
parent 1e086c6474bdc5315b9baaf3a316624a058b8ff2
parent 068131cabcb579dc81cd1ce6abf9238553bb6238

Merge "Remove unused reference to MALLOC_IMPL."

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index de4314c..14e5ec9 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -371,12 +371,6 @@
 LIBART_TARGET_CFLAGS :=
 LIBART_HOST_CFLAGS :=
 
-ifeq ($(MALLOC_IMPL),dlmalloc)
-  LIBART_TARGET_CFLAGS += -DUSE_DLMALLOC
-else
-  LIBART_TARGET_CFLAGS += -DUSE_JEMALLOC
-endif
-
 # Default dex2oat instruction set features.
 LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES := default
 LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default