commit fcd788e853897b87abccad3daa3839f0fc03faa4
author Alex Deymo <deymo@google.com> Sat Jan 14 03:18:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 14 03:18:23 2017 +0000
tree 946e0a7db73b27356b71c387a665ab7ad5c78231
parent 947e45c656fb60a0a7a60ea642d77671342da30e
parent 59948e287946f87b7b418ca10bee15ce597fd1d2

Use ${TMPDIR} as the default working directory. am: 5fbb110c73 am: a54920bef5 am: f178a33066
am: 59948e2879

Change-Id: Ib563a1f7fd6537c2b21e74dbc27476e2eed72a9f

Android.mk

diff --git a/Android.mk b/Android.mk
index 6cde546..617814c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -586,14 +586,6 @@
     libevent \
     libmodpb64 \
     libgtest_prod
-# libchrome requires these extra LDFLAGS which are not propagated through the
-# build system.
-LOCAL_LDFLAGS += \
-    -Wl,-wrap,calloc \
-    -Wl,-wrap,free \
-    -Wl,-wrap,malloc \
-    -Wl,-wrap,memalign \
-    -Wl,-wrap,realloc
 
 ifeq ($(strip $(PRODUCT_STATIC_BOOT_CONTROL_HAL)),)
 # No static boot_control HAL defined, so no sideload support. We use a fake