commit fd6c39c730ef8ea46936375b40521334e8e57065
author Luis Hector Chavez <lhchavez@google.com> Wed Jul 26 20:19:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 20:19:39 2017 +0000
tree 528633e8917b4c0a9eebc038ea10358c986971d0
parent b5d6fa2959f5181733c960ddf34e546119c54c77
parent ffb30ed63b5a186d4ed62c335d16b3b9467785ee

Revert "update_engine: Update libchrome APIS to r456626."
am: ffb30ed63b

Change-Id: Ie43379684549c7206cb5b0a4cd58d6f8318764a0

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