commit d5a1e0aab41143107cdd5bf96a74d50ad93b5cb3
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:42 2017 +0000
tree f1d5001c31a97cd75763c49b1dfbcbff7b180662
parent 52139f92cc27bd09aa5ad6334c30bc553f1821d7
parent 81259681c4cd634c79c657c81f270348fcb5ec80

Parse multiple <app> tag.
am: 81259681c4

Change-Id: I3d988137d9578389e67ad031b62a845607937e1a

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