mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 19:28:25 +00:00
Conflict in amethyst/proguard-rules.pro: both sides appended a keep rule to the
same region. Kept both.
main's `-keep class zxingcpp.** { *; }` is filed with the other JNI rules next to
secp256k1 rather than left where the merge put it, under this branch's
"Enums used as navigation-route ARGUMENTS" heading. Same mechanism as
ArtiNative/secp256k1 — a name-mangled symbol in a .so that R8 cannot see — so it
belongs in that section, and this file is organised by mechanism.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DEoxktEZyTrAS33vVZBiwm