PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using libstdc++.

Browse Source 
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
(cherry picked from commit e49a9e527a)
This commit is contained in:
Dan Albert
2015-05-19 11:33:18 -07:00
committed by Rom Lemarchand
parent 7101b2e285
commit 56deefba73
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
-2
View File
@@ -77,7 +77,6 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \ libcutils \
liblog \ liblog \
libselinux \ libselinux \
libstdc++ \
libm \ libm \
libc libc
@@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := \
libminui \ libminui \
libminzip \ libminzip \
libcutils \ libcutils \
libstdc++ \
libc libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
applypatch/Android.mk
+2 -2
View File
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := main.c
LOCAL_MODULE := applypatch LOCAL_MODULE := applypatch
LOCAL_C_INCLUDES += bootable/recovery LOCAL_C_INCLUDES += bootable/recovery
LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz
LOCAL_SHARED_LIBRARIES += libz libcutils libstdc++ libc LOCAL_SHARED_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@@ -45,7 +45,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_TAGS := eng LOCAL_MODULE_TAGS := eng
LOCAL_C_INCLUDES += bootable/recovery LOCAL_C_INCLUDES += bootable/recovery
LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz
LOCAL_STATIC_LIBRARIES += libz libcutils libstdc++ libc LOCAL_STATIC_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
updater/Android.mk
+1 -1
View File
@@ -34,7 +34,7 @@ endif
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz
LOCAL_STATIC_LIBRARIES += libmincrypt libbz LOCAL_STATIC_LIBRARIES += libmincrypt libbz
LOCAL_STATIC_LIBRARIES += libcutils liblog libstdc++ libc LOCAL_STATIC_LIBRARIES += libcutils liblog libc
LOCAL_STATIC_LIBRARIES += libselinux LOCAL_STATIC_LIBRARIES += libselinux
tune2fs_static_libraries := \ tune2fs_static_libraries := \
libext2_com_err \ libext2_com_err \