commit 52139f92cc27bd09aa5ad6334c30bc553f1821d7
author Sen Jiang <senj@google.com> Thu Jul 13 23:47:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:47:40 2017 +0000
tree 7a29940dcbabf28c396768dee0c1a9c25bc57718
parent a8eb251291949ecc9bf58bf89ad9f2124c20d7ba
parent 94a4decc032ce0cbe44514436f99cdadbc807436

Send both system id and product id to Omaha.
am: 94a4decc03

Change-Id: I3feeaf79b1b8e780284f0c1a05cfeb4a4ac21931

Android.mk

diff --git a/Android.mk b/Android.mk
index cff7081..4801a49 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