Merge "Fixing app compat issue b/72143978" am: 0f2ed7d398 am: 11ecd63660
am: 3e554073a4

Change-Id: I9afc6636175be9da7fc8d8b2900251a7741eaf66
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,