diff options
author | Elliott Hughes <enh@google.com> | 2014-01-03 21:08:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-03 21:08:01 +0000 |
commit | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 (patch) | |
tree | 2280b7e34fe96fdf8862076462aee50f685a85cc /libziparchive | |
parent | e1095e1da12de9d6dc219f497f7c19d1c1f7a41b (diff) | |
parent | 95986aae913d5bf0eb34b5de53a8022d97769dc6 (diff) | |
download | system_core-f5447b0eb9cd2157f4935477f05d4c92dcda37c8.zip system_core-f5447b0eb9cd2157f4935477f05d4c92dcda37c8.tar.gz system_core-f5447b0eb9cd2157f4935477f05d4c92dcda37c8.tar.bz2 |
Merge "Fix a sporadic build breakage."
Diffstat (limited to 'libziparchive')
-rw-r--r-- | libziparchive/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 5d836a1..e754c3b 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -49,7 +49,7 @@ LOCAL_CFLAGS += \ -DGTEST_OS_LINUX_ANDROID \ -DGTEST_HAS_STD_STRING LOCAL_SRC_FILES := zip_archive_test.cc -LOCAL_LDFLAGS := -llog +LOCAL_SHARED_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils include $(BUILD_NATIVE_TEST) |