commit daafe2263b22fad3614284c15466d320d0341345
author Daniel Erat <derat@chromium.org> Thu Jun 01 19:56:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 19:56:28 2017 +0000
tree c4ca282245be9a88b62f702017c1432b090407c9
parent f5814852f11d7c7963e93ffbb0de492ddb822d4b
parent dbfbe6ed67cb314584216e6f7ed410cc49394feb

update_engine: Use org.chromium.NetworkProxyService. am: e5f6f2571d am: 554ebcf204
am: dbfbe6ed67

Change-Id: I3b03666d574351ae7445dd57c16fb80c5ef8566f

Android.mk

diff --git a/Android.mk b/Android.mk
index cff7081..4801a49 100644
--- a/Android.mk
+++ b/Android.mk
@@ -496,14 +496,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