commit 14c2ae4a6e62b78f2c994112d08dbe3d4de64695
author Elliott Hughes <enh@google.com> Wed Jan 10 01:55:14 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 10 01:55:14 2018 +0000
tree 7981c78896d8a1cf76c70150356a55449136b832
parent c27f70dc46c39b3fd57897d5ea75cbcbdf432783
parent 8ca799e22f2da399b2e95dafb7f43d61ac21d393

Merge "Remove obsolete workaround." am: f448371208 am: 365604c300
am: 8ca799e22f

Change-Id: I6afd17cacebc896831f3b6049e850d671c2d7f73

native/graphics/jni/Android.bp

diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index 0704e35..61164e0 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -29,13 +29,6 @@
     shared_libs: [
         "libandroid_runtime",
     ],
-
-    arch: {
-        arm: {
-            // TODO: This is to work around b/24465209. Remove after root cause is fixed
-            ldflags: ["-Wl,--hash-style=both"],
-        },
-    },
 }
 
 // The headers module is in frameworks/native/Android.bp.