commit 1559d44d1bd0e120d63e06ffe6eae479b35fc4b2
author Josh Gao <jmgao@google.com> Mon Jan 25 18:31:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 25 18:31:13 2016 +0000
tree ddf5264545c58358176904262f8c83d8d02f105e
parent 2cf2509542d234e4d958195c834b74da2253b2cb
parent 1ae548d81daf1938be67d902512fa0c4d8f6d502

Merge "Error out if MALLOC_IMPL is defined."
am: 1ae548d81d

* commit '1ae548d81daf1938be67d902512fa0c4d8f6d502':
  Error out if MALLOC_IMPL is defined.

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 6c38e99..46c1463 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -154,6 +154,10 @@
 ifeq ($(TARGET_ARCH),)
   $(error TARGET_ARCH not defined by board config: $(board_config_mk))
 endif
+ifneq ($(MALLOC_IMPL),)
+  $(warning *** Unsupported option MALLOC_IMPL defined by board config: $(board_config_mk).)
+  $(error Use `MALLOC_SVELTE := true` to configure jemalloc for low-memory)
+endif
 TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
 board_config_mk :=