commit 2755c5bf8e006c4a1e8b2b9e2f61edfd675b0b43
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:52 2017 +0000
tree a6cce7c15f0c50223765a09687c795e79226d97c
parent e7f94b82412fed9f78c3316ea9dc89b6955ffbf0
parent 5006aeac1064598f0442e00e817b5dbc9f4b1d5b

Treat noupdate="true" as noupdate.
am: 5006aeac10

Change-Id: I3b162a884ff0159f229349ea4fc68be51b4f427f

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