commit e1b31f3f81ef4a539a2e81363b45109dbe9a7c2a
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:55 2017 +0000
tree 6d71958351cc4c87f66f0e468570745d8a8fb7d9
parent 2755c5bf8e006c4a1e8b2b9e2f61edfd675b0b43
parent cdd5206c6507fa5c70344c269053d30777f7d674

Support IsDeltaPayload per <package>.
am: cdd5206c65

Change-Id: I730da39b37e329347609b388e14e587aeba2747a

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