commit e3740d215585ff7b4f81e1349a01db80800737d3
author Tianjie Xu <xunchang@google.com> Wed Jun 21 20:54:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 20:54:06 2017 +0000
tree 87fb95ac15360ac2da73ea3eb4220a24302053ac
parent 059bbe8a00bb925453f9a8c78602ad45fadae157
parent 65e115f0d233f9056abdc96cdc1a598b9a460185

Add multi thread support for A/B generator am: c4ad1ebc33
am: 65e115f0d2

Change-Id: I312819e33f2e85d8a5bd887680fd5f8d3b254747

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