commit 3d6ff825bed79a4650765393d286dd6899270330
author Alex Deymo <deymo@google.com> Wed Mar 22 22:59:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 22 22:59:42 2017 +0000
tree 62d11172a0b2239b6741bce994d3a1f30b8bb809
parent e5e69d283f6d38e015715e43febba2012040e5f4
parent 1519cf67044335e95ed70bf443f6bc508f5af4b0

Set the uid to AID_OTA_UPDATE when tagging sockets. am: eb2565593f am: 55bb875601
am: 1519cf6704

Change-Id: I3fc17ac841c2f46020482bf8f04976217cb073b8

Android.mk

diff --git a/Android.mk b/Android.mk
index c7b7db0..d545cd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -514,14 +514,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