commit b5d6fa2959f5181733c960ddf34e546119c54c77
author Jay Civelli <jcivelli@google.com> Wed Jul 26 01:54:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 01:54:05 2017 +0000
tree 32bb34315f9b95e155faa59cc14a92b2fbc94481
parent 14e42e248b16675587d625595c2aa22ccfa3f1eb
parent 663ff4b30b9f629a130ef6d357d462b897d4071e

update_engine: Update libchrome APIS to r456626.
am: 663ff4b30b

Change-Id: I25eaa546588207beeb840053dc0691bbb5ea1b6a

Android.mk

diff --git a/Android.mk b/Android.mk
index d05e7f4..41f92d2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -489,14 +489,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