diff options
| author | Dan Albert <danalbert@google.com> | 2015-05-20 22:54:49 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 22:54:49 +0200 |
| commit | 0b1d15742f4cc7f930981fc63ee74b5df51ce719 (patch) | |
| tree | d5f4c109941ecb866ddabb30883aa4df08039942 | |
| parent | am 6253753a: Merge "Add error and range checks to parse_range" (diff) | |
| parent | Merge "Stop using libstdc++." (diff) | |
| download | android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar.gz android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar.bz2 android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar.lz android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar.xz android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.tar.zst android_bootable_recovery-0b1d15742f4cc7f930981fc63ee74b5df51ce719.zip | |
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | applypatch/Android.mk | 4 | ||||
| -rw-r--r-- | updater/Android.mk | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 0484065a1..3bcbeab03 100644 --- a/Android.mk +++ b/Android.mk @@ -76,7 +76,6 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ liblog \ libselinux \ - libstdc++ \ libm \ libc @@ -119,7 +118,6 @@ LOCAL_STATIC_LIBRARIES := \ libminui \ libminzip \ libcutils \ - libstdc++ \ libc include $(BUILD_EXECUTABLE) diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 4984093dd..861edd24d 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) diff --git a/updater/Android.mk b/updater/Android.mk index ff02a33b0..57f43da96 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -32,7 +32,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 \ |