commit ac95cd54dd1faf398724bdcfe2c4b096fa4fc2d6
author Alex Deymo <deymo@google.com> Mon Aug 21 09:57:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 21 09:57:54 2017 +0000
tree e5bd28fd481faed324f205867be6236eccd4d8fd
parent 74900922711522f384355beb3c63862f564113af
parent 4a53c76795b4df0a4ea6636ee740371ffe83d7b4

Remove unused FileDescriptor::Reset().
am: 4a53c76795

Change-Id: Ieb6958c06a36ba4e2b640fc2919a0c7e5d6ce693

Android.mk

diff --git a/Android.mk b/Android.mk
index d05e7f4..41f92d2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -489,14 +489,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