commit 9185e04f72c16d2a66d92ac89b38ee926d7f706b
author Dmitriy Ivanov <dimitry@google.com> Fri May 15 17:53:39 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri May 15 18:42:14 2015 -0700
tree e6cf2006eb78c9fbd28a64573a40370508f91624
parent 0378d8f65126b2d94c731f2719a68773e370f615

Apply work around b/19059885 to x86

Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
(cherry picked from commit 69a5fb951d69689dedd83cb033ae3dcd0ef05b65)

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 529dda8..4a5bbad 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -515,6 +515,7 @@
 
 # TODO: This is to work around b/19059885. Remove after root cause is fixed
 LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
+LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
 
 LOCAL_MODULE := libm
 LOCAL_CLANG := $(libm_clang)