commit f5814852f11d7c7963e93ffbb0de492ddb822d4b
author Weidong Guo <weidongg@chromium.org> Thu Jun 01 19:56:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 19:56:26 2017 +0000
tree 2717b3c70769f0946ceb938935d66bf1e4dff959
parent 77b0b5b4527abbbf0f4d722ec1093c6e55e522b1
parent 6fdd135cb2373374cd2a73345307fbc0f2779d49

Add functions to allow update over cellular (including tethered connection) am: 4b0d6032cb am: edd4cd2c48
am: 6fdd135cb2

Change-Id: I43dd3f8717c2af7be2e577af2b269421c5f8ed7c

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