diff options
| author | 2024-06-24 16:35:16 +0000 | |
|---|---|---|
| committer | 2024-06-24 16:35:16 +0000 | |
| commit | 5160f02b8eb07350f236d4f3536f141c369d2f29 (patch) | |
| tree | 77c577b8444e41b42e9f3875611e8246912bfb9d | |
| parent | c4ecd2a100057f192110147159b26a73b452c3a0 (diff) | |
| parent | be74c988fdacc75b43e7c02971f9cac707d9e7ec (diff) | |
Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into main am: be74c988fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3137453
Change-Id: I075c8d8964831689de913fef7b68652ff8375f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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: { |