| commit | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 03 21:08:00 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 03 21:08:01 2014 +0000 |
| tree | 2280b7e34fe96fdf8862076462aee50f685a85cc | |
| parent | e1095e1da12de9d6dc219f497f7c19d1c1f7a41b [diff] | |
| parent | 95986aae913d5bf0eb34b5de53a8022d97769dc6 [diff] |
Merge "Fix a sporadic build breakage."
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 @@ -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)