commit 77b0b5b4527abbbf0f4d722ec1093c6e55e522b1
author Chirantan Ekbote <chirantan@chromium.org> Thu Jun 01 19:56:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 19:56:24 2017 +0000
tree c5990305c0c500038e6fced54a781d722921b74e
parent 1a65c4128004db5598f59e20417df72e8763b291
parent 0fd2acd5963419b0e240b832c0693074c3444136

Remove redundant dbus USE variable am: d6803aa21c am: da85a3f303
am: 0fd2acd596

Change-Id: Idc456106367b3b71ff496a976ecde4fe03015b25

Android.mk

diff --git a/Android.mk b/Android.mk
index cff7081..4801a49 100644
--- a/Android.mk
+++ b/Android.mk
@@ -496,14 +496,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