commit e7f94b82412fed9f78c3316ea9dc89b6955ffbf0
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:50 2017 +0000
tree c657f090704daf50d45e31ba1b44cee5b2d08724
parent 0ec5d95844f58b019838e08b4d5d28d00047813d
parent 5ae865b431cc041feed82f1db28a38e99dbd631f

Resume multiple payloads.
am: 5ae865b431

Change-Id: I90b2f4b60f26cb7c9d810fa93f1345c20e816420

Android.mk

diff --git a/Android.mk b/Android.mk
index 16c6381..226b09f 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