commit f1e81c0f5da9852426fd84af016b35e03c5534dd
author Steven Moreland <smoreland@google.com> Thu Jan 05 18:38:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 18:38:00 2017 +0000
tree c6e891da68653f153df7544ec1dffc7970661407
parent 4da209efc9c05921004eeb6b31e7c151af89a941
parent 224bdd888f0fcd78c47e5e33fc4901d074517abf

boot control: remove getInterfaceVersion reference am: 927e00d1e9 am: 3fe093d6aa am: 2a15abb484
am: 224bdd888f

Change-Id: I07147fa3816df223cd9ab27e7a441a677a7f7734

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