From: Josh Gao <jmgao@google.com>
Date: Fri, 22 Jan 2016 19:24:59 +0000 (-0800)
Subject: Error out if MALLOC_IMPL is defined.
X-Git-Tag: android-x86-7.1-r1~492^2~26^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f3e7204befe0984135dd078316a5efcf58dd8625;p=android-x86%2Fbuild.git

Error out if MALLOC_IMPL is defined.

Bug: http://b/26390299
Change-Id: Icd3ce6853c8207b1a9ce1f9d546a61d5b113f15a
---

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 6c38e99a8..46c146394 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -154,6 +154,10 @@ include $(board_config_mk)
 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 :=