diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-03 15:40:37 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-03 15:40:37 +0000 |
| commit | 95986aae913d5bf0eb34b5de53a8022d97769dc6 (patch) | |
| tree | 63718f5c84020b578ab7eba67375d052864f088b /libziparchive | |
| parent | 268cc54089cbdeb0c2ea955448bb16a0858c4538 (diff) | |
| download | system_core-95986aae913d5bf0eb34b5de53a8022d97769dc6.zip system_core-95986aae913d5bf0eb34b5de53a8022d97769dc6.tar.gz system_core-95986aae913d5bf0eb34b5de53a8022d97769dc6.tar.bz2 | |
Fix a sporadic build breakage.
The issue here is that the makefile sets LOCAL_LDFLAGS
and asks for -llog without declaring a dependency on it.
This will cause build breakages if liblog hasn't already
been built yet.
Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce
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) |