commit 7a1f89b5c71ace13906208d2fb6f5fa75118240a
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:57 2017 +0000
tree dd6e64f5bb4d74a61a8ab3758d3f3635a4fda9be
parent e1b31f3f81ef4a539a2e81363b45109dbe9a7c2a
parent 1d5d95ffd80c96de1ca488f6c87a6f54301dadf3

Report build_type to Omaha.
am: 1d5d95ffd8

Change-Id: I1a30e7541bc829f5bb0e9e0802d7a4615312deba

Android.mk

diff --git a/Android.mk b/Android.mk
index 16c6381..226b09f 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