commit e9c2bcb99da1909272adaba624ff5dc4afe2ba73
author Alex Deymo <deymo@google.com> Sat Mar 25 01:51:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 25 01:51:04 2017 +0000
tree ddcc58741e91b6f74c8d984105b15d9abffaaf94
parent 7c8ead91cc548af0acfbd7e87676931e323f12f5
parent b16438bd1a88d59b8bc4d72ed1b86f3b991b87d9

Unmount old postinstall mountpoint from previous runs. am: f411650403 am: ddccea485e
am: b16438bd1a

Change-Id: I781fa3389041ebf4e104fcff585385d8ae5e3689

Android.mk

diff --git a/Android.mk b/Android.mk
index c7b7db0..d545cd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -514,14 +514,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