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

am: 1559d44d1b

* commit '1559d44d1bd0e120d63e06ffe6eae479b35fc4b2':
  Error out if MALLOC_IMPL is defined.
This commit is contained in:
Josh Gao
2016-01-25 18:33:01 +00:00
committed by android-build-merger

View File

@@ -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 :=