commit be74c988fdacc75b43e7c02971f9cac707d9e7ec
author Elliott Hughes <enh@google.com> Mon Jun 24 16:31:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 24 16:31:21 2024 +0000
tree b5017344f32b634464c424d285e3a0c298973904
parent 0afe05cc8bd74f433d0956a7f3a06972e2561c81
parent 395607d5af77cad6a57b59f80a071c23ff1955a0

Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into main

native/graphics/jni/Android.bp

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: {