commit 682b6460611089926be0b420e0329f48c640a3d9
author Dmitriy Ivanov <dimitry@google.com> Tue Mar 10 15:12:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 15:12:19 2015 +0000
tree 47d9e9e6dff2a135d38e61e767cbb9751a03a926
parent f741fc00374b4fd571c1c5e993627ed9ab6e6a3b
parent 4c37448f79ec0dba9634ef037a7217bd60799766

am 4c37448f: am 19833d24: Merge "Generate sysv hash for liblog"

* commit '4c37448f79ec0dba9634ef037a7217bd60799766':
  Generate sysv hash for liblog

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 4e6424a..89fca44 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -83,6 +83,10 @@
 LOCAL_MODULE := liblog
 LOCAL_WHOLE_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS := -Werror $(liblog_cflags)
+
+# TODO: This is to work around b/19059885. Remove after root cause is fixed
+LOCAL_LDFLAGS := -Wl,--hash-style=both
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call first-makefiles-under,$(LOCAL_PATH))