commit b7532351d67aa3d9d3a98685a215d97bd414af98
author Alex Deymo <deymo@google.com> Wed Mar 22 22:59:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 22 22:59:52 2017 +0000
tree 953a4cff30771a3689cb6aecc64c03844ab4b22d
parent 3d6ff825bed79a4650765393d286dd6899270330
parent 5085a72b635df3bf2aef4dcb4c1a6bb2cc428adc

Send the system image build fingerprint and bootloader versions. am: ebf6e1228e am: 8ad358c3f3
am: 5085a72b63

Change-Id: I3853b2b80251e2430680bf787aa5544ee35a59fb

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