From 7bb9785a1d4cbaaf5d2222bbfa03812db40c49a8 Mon Sep 17 00:00:00 2001
From: Ian Pedowitz <ijpedowitz@google.com>
Date: Thu, 18 Jan 2018 16:25:24 -0800
Subject: [PATCH] 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
---
 liblog/Android.bp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/liblog/Android.bp b/liblog/Android.bp
index eae0b10eb..7d9e30602 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -80,6 +80,10 @@ cc_library {
                 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,