From 1b0f2b49d528c90842b4263269d9039d7e07415e Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 10 Jan 2018 11:05:19 -0800
Subject: Remove obsolete workaround.

Bug: http://b/24465209
Test: manually ran the app.
Change-Id: I1e2a498864c74ff3a9886b97f7dc60ad7f6dfa44
---
 libdl/Android.bp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'libdl')

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 3889bdb2d..041ee26a1 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -4,7 +4,10 @@
 cc_library_static {
     name: "libdl_static",
 
-    srcs: ["libdl.cpp", "libdl_cfi.cpp"],
+    srcs: [
+        "libdl.cpp",
+        "libdl_cfi.cpp",
+    ],
 
     cflags: [
         "-Wall",
@@ -43,7 +46,6 @@ cc_library {
     arch: {
         arm: {
             version_script: "libdl.arm.map",
-            ldflags: ["-Wl,--hash-style=both"],
         },
         arm64: {
             version_script: "libdl.arm64.map",
@@ -57,7 +59,6 @@ cc_library {
         x86: {
             ldflags: [
                 "-Wl,--exclude-libs=libgcc_eh.a",
-                "-Wl,--hash-style=both",
             ],
             version_script: "libdl.x86.map",
         },
@@ -70,7 +71,7 @@ cc_library {
         whole_static_libs: ["libdl_static"],
     },
     static: {
-        srcs: [ "libdl_static.c" ],
+        srcs: ["libdl_static.c"],
     },
     cflags: [
         "-Wall",
@@ -90,7 +91,7 @@ cc_library {
 
     // This is placeholder library the actual implementation is (currently)
     // provided by the linker.
-    shared_libs: [ "ld-android" ],
+    shared_libs: ["ld-android"],
 
     sanitize: {
         never: true,
-- 
cgit v1.2.3