Merge "Fix the linking error due to libminui change" am: 5e9cc93aca

am: d5d88e29d2

Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf
(cherry picked from commit 8a5ec8ef99deefb361c37982a3783b04b9ed22ee)

diff --git a/slideshow/Android.mk b/slideshow/Android.mk
index f5d85a2..bd66420 100644 (file)
--- a/slideshow/Android.mk
+++ b/slideshow/Android.mk
@@ -11,5 +11,5 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
 
 LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS -Werror
-LOCAL_STATIC_LIBRARIES := libminui libpng libz libutils libstdc++ libcutils liblog libm libc
+LOCAL_STATIC_LIBRARIES := libminui libpng libz libutils libcutils liblog libm libc
 include $(BUILD_EXECUTABLE)