commit 207608d42c263672a216d1f98f1a1c1caab20bcd
author Sen Jiang <senj@google.com> Thu Jul 13 23:48:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:48:06 2017 +0000
tree 9051865e05f6c2086aedb3962351586e8e3a2338
parent da3cc9808d72f258065fe67950fe0bc2e725b6ab
parent b56fe9f1071c1506d996f8c8e1da780b607fea78

Use the prefix in product_id for system_id.
am: b56fe9f107

Change-Id: I46289dee6e72d121ca131dc24d7a56a87f83d48b

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