commit 059bbe8a00bb925453f9a8c78602ad45fadae157
author Tao Bao <tbao@google.com> Tue Jun 06 23:08:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 06 23:08:00 2017 +0000
tree ef025faf8ea69b3d2673379fe88641829ea1236f
parent daafe2263b22fad3614284c15466d320d0341345
parent 343d05d0a1dcfbdaef761f003eb1d38cff83dbf8

Revert "Add functions to allow update over cellular (including tethered connection)" am: 5688d16057 am: c5ee00df90
am: 343d05d0a1

Change-Id: I6dfabc89d0a24aec69fbb5d919044bb6b839a0a5

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