commit dc9ae90d61129501a80323c14b2673003ecf065b
author Ian Pedowitz <ijpedowitz@google.com> Thu Jan 18 16:25:24 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jan 19 03:16:24 2018 +0000
tree f17cdaf018d24f4616f0a2fc340d38c33bd5b204
parent 60fe0152d32ab936a1127c681b707357baed388d

Fixing app compat issue b/72143978

Revert "Remove obsolete workaround."

This reverts commit 1f3ac7583feaf591ee23fcc69d56d29613020b4f.

Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
(cherry picked from commit 7bb9785a1d4cbaaf5d2222bbfa03812db40c49a8)

Change-Id: Idd26e6c53320cd8b1be70b0894f4ed08e434b80d

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index eae0b10..7d9e306 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -80,6 +80,10 @@
                 address: false,
             },
         },
+        android_arm: {
+            // TODO: This is to work around b/24465209. Remove after root cause is fixed
+            ldflags: ["-Wl,--hash-style=both"],
+        },
         windows: {
             srcs: ["uio.c"],
             enabled: true,