Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56deefba authored by Dan Albert's avatar Dan Albert Committed by Rom Lemarchand
Browse files

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
(cherry picked from commit e49a9e52)
parent 7101b2e2

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcutils \

    liblog \

    libselinux \

    libstdc++ \

    libm \

    libc
@@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := \ 
    libminui \

    libminzip \

    libcutils \

    libstdc++ \

    libc

include $(BUILD_EXECUTABLE)

applypatch/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,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)
@@ -45,7 +45,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)

updater/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ endif 
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)

LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz

LOCAL_STATIC_LIBRARIES += libmincrypt libbz

LOCAL_STATIC_LIBRARIES += libcutils liblog libstdc++ libc

LOCAL_STATIC_LIBRARIES += libcutils liblog libc

LOCAL_STATIC_LIBRARIES += libselinux

tune2fs_static_libraries := \

 libext2_com_err \