commit 696d1109239315dad87b07484228d14e9d8a4f7d
author Mark Urbanus <urbanus@google.com> Thu Dec 15 15:42:30 2016 -0800
committer Mark Urbanus <urbanus@google.com> Fri Dec 16 09:56:17 2016 -0800
tree 598599ea2a7aebb3608c63f31b1361eab523e5e6
parent 167b6682ef5d9dfc3a6f09d2ddb5213ab201745f

Remove libchrome dependent linker flags

We removed the experimental allocator shim from libchrome, which
removes the necessity of having the -wrap* linker flags.

Bug: 33239390
Test: validated update_engine can be built properly

Change-Id: I307458324493b53522a924b1539d11fc9dfc77dc

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