Use the factored out bug 24465209 workaround for libjnigraphics.
Slight functional change: the global workaround includes both ILP32 ABIs, not just arm. But since none of this is going to be removed until we remove the ILP32 ABIs completely (and x86 only really still exists as a proxy for convenient CI testing of arm32), that seems reasonable.
Change-Id: I4d3d72ee5846a155a8ca547cfd3180bde735cd27
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index 746c280..8f16f76 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -23,6 +23,9 @@
cc_library_shared {
name: "libjnigraphics",
+ defaults: [
+ "bug_24465209_workaround",
+ ],
cflags: [
"-Wall",
@@ -47,13 +50,6 @@
static_libs: ["libarect"],
- arch: {
- arm: {
- // TODO: This is to work around b/24465209. Remove after root cause is fixed
- pack_relocations: false,
- ldflags: ["-Wl,--hash-style=both"],
- },
- },
host_supported: true,
target: {
android: {