summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-05-19 20:33:18 +0200
committerRom Lemarchand <romlem@google.com>2015-11-16 23:28:40 +0100
commit56deefba73fb318ba0498da49adc64de960a6e29 (patch)
tree4f644a4620d3771094f7da995b9bf83db61f3604
parentrecovery: Switch to clang (diff)
downloadandroid_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar.gz
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar.bz2
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar.lz
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar.xz
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.tar.zst
android_bootable_recovery-56deefba73fb318ba0498da49adc64de960a6e29.zip
-rw-r--r--Android.mk2
-rw-r--r--applypatch/Android.mk4
-rw-r--r--updater/Android.mk2
3 files changed, 3 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index ac1ef83d8..e43d55f66 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 4936db2a2..eb3e4580e 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -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)
diff --git a/updater/Android.mk b/updater/Android.mk
index a3df805ef..a0ea06fa5 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -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 \