commit 947e45c656fb60a0a7a60ea642d77671342da30e
author Alex Deymo <deymo@google.com> Wed Jan 11 03:09:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 11 03:09:00 2017 +0000
tree c6e891da68653f153df7544ec1dffc7970661407
parent f1e81c0f5da9852426fd84af016b35e03c5534dd
parent 5c53faa55deb297f479e4ce9249e3f6e77492ca8

DO NOT MERGE: Parse Android .map files for unknown filesystem. am: c736d4791c  -s ours
am: 5c53faa55d  -s ours

Change-Id: I2bf3e12ffc18fb9dcc5c4eb81cbd95aa6f36b728

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