diff options
author | Tianjie Xu <xunchang@google.com> | 2017-03-28 20:03:37 +0000 |
---|---|---|
committer | Tianjie Xu <xunchang@google.com> | 2017-03-28 22:26:57 +0000 |
commit | 68b15e1f28c172ca60b0eb443c9f5809136eff8f (patch) | |
tree | b141247a896c3a64722490a5ab68bf5b0a96b833 | |
parent | 62e612453d307ad51c9871e1af62be0826058dde (diff) | |
download | extras-68b15e1f28c172ca60b0eb443c9f5809136eff8f.tar.gz |
Merge "Fix the linking error due to libminui change" am: 5e9cc93aca
am: d5d88e29d2
Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf
(cherry picked from commit 8a5ec8ef99deefb361c37982a3783b04b9ed22ee)
-rw-r--r-- | slideshow/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/Android.mk b/slideshow/Android.mk index f5d85a2f..bd664207 100644 --- 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) |