Merge "Fixing app compat issue b/72143978"

2018-01-19 02:38:33 +00:00
parent 898137f817 0c3c4d1c7d
commit 8353a39ecc
1 changed files with 7 additions and 0 deletions
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -30,6 +30,13 @@ cc_library_shared {
        "libandroid_runtime",
        "libskia",
    ],
+
+    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.