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

* commit 'a166bea18ffd304163bddec4701904d91541f527':
  Fix a sporadic build breakage.
This commit is contained in:
Elliott Hughes 2014-01-03 21:14:46 +00:00 committed by Android Git Automerger
commit 687ec9b5e1

View file

@ -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)