Merge "Stop using libstdc++."
This commit is contained in:
@@ -76,7 +76,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcutils \
|
libcutils \
|
||||||
liblog \
|
liblog \
|
||||||
libselinux \
|
libselinux \
|
||||||
libstdc++ \
|
|
||||||
libm \
|
libm \
|
||||||
libc
|
libc
|
||||||
|
|
||||||
@@ -119,7 +118,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libminui \
|
libminui \
|
||||||
libminzip \
|
libminzip \
|
||||||
libcutils \
|
libcutils \
|
||||||
libstdc++ \
|
|
||||||
libc
|
libc
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,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)
|
||||||
|
|
||||||
@@ -41,7 +41,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)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,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 \
|
||||||
|
|||||||
Reference in New Issue
Block a user