commit da3cc9808d72f258065fe67950fe0bc2e725b6ab
author Sen Jiang <senj@google.com> Thu Jul 13 23:48:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:48:03 2017 +0000
tree 39ab5d8a6a28e6b4e9c9424f0865f7df79a315da
parent 97eb291f3f2565259f83465248c8dd32fddbae2d
parent 3faf4e7c91595f46a3bf80a348ca46b791d5b675

Report system_version in os version.
am: 3faf4e7c91

Change-Id: Ic82307f22c271146de66e673fb46f9234627d54a

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