summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-05-19 11:33:18 -0700
committerSteve Kondik <steve@cyngn.com>2015-11-07 19:02:26 -0800
commit6afe02e13ace7a278d17c38187befb94ff80a07c (patch)
tree60ad47102b0ba39aa2b313506d22af3ab53fa30f /applypatch
parent84e7357a07c9dbecc83a5f3efa98cfc0f8289178 (diff)
downloadbootable_recovery-6afe02e13ace7a278d17c38187befb94ff80a07c.zip
bootable_recovery-6afe02e13ace7a278d17c38187befb94ff80a07c.tar.gz
bootable_recovery-6afe02e13ace7a278d17c38187befb94ff80a07c.tar.bz2
Stop using libstdc++.
These are already getting libc++, so it isn't necessary. If any of the other static libraries (such as adb) use new or delete from libc++, there will be symbol collisions. Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
Diffstat (limited to 'applypatch')
-rw-r--r--applypatch/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 4984093..861edd2 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -29,7 +29,7 @@ LOCAL_SRC_FILES := main.c
LOCAL_MODULE := applypatch
LOCAL_C_INCLUDES += bootable/recovery
LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz
-LOCAL_SHARED_LIBRARIES += libz libcutils libstdc++ libc
+LOCAL_SHARED_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE)
@@ -41,7 +41,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_TAGS := eng
LOCAL_C_INCLUDES += bootable/recovery
LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz
-LOCAL_STATIC_LIBRARIES += libz libcutils libstdc++ libc
+LOCAL_STATIC_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE)