summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-04-10 07:21:14 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-10 07:21:14 +0200
commite5d37b409f61c8380ec684162b8a50aa571b9f3e (patch)
tree018fdbff9882884d7879751be3ff4b6d69e1d368
parentam b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge (diff)
parentAdd liblog (diff)
downloadandroid_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar.gz
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar.bz2
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar.lz
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar.xz
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.tar.zst
android_bootable_recovery-e5d37b409f61c8380ec684162b8a50aa571b9f3e.zip
-rw-r--r--Android.mk1
-rw-r--r--mtdutils/Android.mk2
-rw-r--r--updater/Android.mk2
3 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 35151ee70..075fa2cfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,6 +48,7 @@ LOCAL_STATIC_LIBRARIES := \
libpng \
libfs_mgr \
libcutils \
+ liblog \
libselinux \
libstdc++ \
libm \
diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk
index ef417fa19..f04355b5e 100644
--- a/mtdutils/Android.mk
+++ b/mtdutils/Android.mk
@@ -14,5 +14,5 @@ LOCAL_SRC_FILES := flash_image.c
LOCAL_MODULE := flash_image
LOCAL_MODULE_TAGS := eng
LOCAL_STATIC_LIBRARIES := libmtdutils
-LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_EXECUTABLE)
diff --git a/updater/Android.mk b/updater/Android.mk
index 4271371e9..67e98ecd4 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -31,7 +31,7 @@ LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDA
LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz
LOCAL_STATIC_LIBRARIES += libmincrypt libbz
LOCAL_STATIC_LIBRARIES += libminelf
-LOCAL_STATIC_LIBRARIES += libcutils libstdc++ libc
+LOCAL_STATIC_LIBRARIES += libcutils liblog libstdc++ libc
LOCAL_STATIC_LIBRARIES += libselinux
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..