diff options
| author | 2024-06-24 16:31:21 +0000 | |
|---|---|---|
| committer | 2024-06-24 16:31:21 +0000 | |
| commit | be74c988fdacc75b43e7c02971f9cac707d9e7ec (patch) | |
| tree | b5017344f32b634464c424d285e3a0c298973904 | |
| parent | 0afe05cc8bd74f433d0956a7f3a06972e2561c81 (diff) | |
| parent | 395607d5af77cad6a57b59f80a071c23ff1955a0 (diff) | |
Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into main
| -rw-r--r-- | native/graphics/jni/Android.bp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp index 746c280edc70..8f16f762f7ef 100644 --- a/native/graphics/jni/Android.bp +++ b/native/graphics/jni/Android.bp @@ -23,6 +23,9 @@ package { cc_library_shared { name: "libjnigraphics", + defaults: [ + "bug_24465209_workaround", + ], cflags: [ "-Wall", @@ -47,13 +50,6 @@ cc_library_shared { 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: { |