Fixing app compat issue b/72143978
Revert "Remove obsolete workaround."
This reverts commit 5e48241a95b843c10f96c57d8544af9d04807218.
Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index 5785b0c..d7695ef 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -30,6 +30,13 @@
"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.