commit a166bea18ffd304163bddec4701904d91541f527
author Elliott Hughes <enh@google.com> Fri Jan 03 13:12:12 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 03 13:12:12 2014 -0800
tree 6d07edaa5ea48f2f8d17389de8378ca88eef94b2
parent 4600d80cef73af052cbba25c7af0d7abfda6e08b
parent f5447b0eb9cd2157f4935477f05d4c92dcda37c8

am f5447b0e: Merge "Fix a sporadic build breakage."

* commit 'f5447b0eb9cd2157f4935477f05d4c92dcda37c8':
  Fix a sporadic build breakage.

libziparchive/Android.mk

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)