commit f1630b6a83787e064ac727d7ce7e8eeaeb861fa7
author Dan Albert <danalbert@google.com> Fri Oct 23 16:16:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 23 16:16:22 2015 +0000
tree 44051229c21cc3faf6dff78f75e42104adf9c33c
parent 5be49d9d58d793e6843dc691b8cf70e75530f8c9
parent 456ae45ddd054c38b97876e4fe9b2e53d7cc72a3

Merge "Don\'t use libstdc++." am: f4e2045319
am: a9d3ab44e5

* commit 'a9d3ab44e54129d92ef75488c28bd7f8c33cde72':
  Don't use libstdc++.

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index 07e1d73..27c985c 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -35,7 +35,7 @@
 
 LOCAL_C_INCLUDES := bootable/recovery
 
-LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder libminui libpng libz libutils libstdc++ libcutils liblog libm libc
+LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder libminui libpng libz libutils libcutils liblog libm libc
 
 ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)
 LOCAL_STATIC_LIBRARIES += libsuspend