summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-12-03 20:59:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-03 20:59:29 +0000
commitddb1e43c8f51d453ae108d98701cf3858f1083cb (patch)
treef2149a43ba343e85587d3f3f990ac6d5e8739e07
parentf7bd9fa832e3256aa4eb940d1e844f07d966b7ab (diff)
parent14558e438e61d73bf3d1cc27ae55a3a7f70556a2 (diff)
downloaddeb-ddb1e43c8f51d453ae108d98701cf3858f1083cb.tar.gz
Merge "Really enable jemalloc."android-wear-5.0.0_r1lollipop-wear-release
-rw-r--r--BoardConfig.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2c99425..97629d5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,7 +24,5 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/asus/deb
TARGET_RECOVERY_FSTAB = device/asus/deb/fstab.deb
-MALLOC_IMPL := dlmalloc
-
-include vendor/asus/deb/BoardConfigVendor.mk
include device/asus/flo/BoardConfigCommon.mk