commit a8eb251291949ecc9bf58bf89ad9f2124c20d7ba
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:38 2017 +0000
tree dfd7f4695d127e8fb5c195550a7bb64b6c09113e
parent ca432978947f93486536a740adadce6e93db69b1
parent 6c73668ddcd3dd905c976808bfa13609eeef00b9

Apply multiple payload in DownloadAction.
am: 6c73668ddc

Change-Id: I3469a83eb80ef89e6ebc2873385fa0ec706fe4a7

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