commit 07cb78755ff31283a98223b2e4c277d4d95903ad
author Sen Jiang <senj@google.com> Thu Jul 13 23:48:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:48:09 2017 +0000
tree 7f2c8eb80aa4a24914d0a97289e3f578fda41819
parent 207608d42c263672a216d1f98f1a1c1caab20bcd
parent 00adf7b3141e05051eeeffb57056ffbe67eacfb9

Don't update if any app has status="noupdate".
am: 00adf7b314

Change-Id: I388f69aae722599983b262c885f2c581c6d96581

Android.mk

diff --git a/Android.mk b/Android.mk
index 67a1de4..a3a7017 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