commit 4da209efc9c05921004eeb6b31e7c151af89a941
author Yifan Hong <elsk@google.com> Thu Dec 22 18:43:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 22 18:43:59 2016 +0000
tree 97a344735e7c9ae555567a89689e14b8a7e59c9d
parent 696d1109239315dad87b07484228d14e9d8a4f7d
parent 02f4036d91cb24b9ab938ed35babf458615e8751

Update for hiding Status from Return<T> object. am: 7b514b4f91 am: 8f72b4db31 am: 8cbf977cda
am: 02f4036d91

Change-Id: I143bbed5489b7466894b30746bc6d168dd2aa2d4

Android.mk

diff --git a/Android.mk b/Android.mk
index 6cde546..617814c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -586,14 +586,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