Skip to content

fix: android consumer-rules - #107

Draft
ovitrif wants to merge 8 commits into
mainfrom
fix/r8-keep-fieldorder
Draft

fix: android consumer-rules#107
ovitrif wants to merge 8 commits into
mainfrom
fix/r8-keep-fieldorder

Conversation

@ovitrif

@ovitrif ovitrif commented Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Fixes #105

Follow-up to #106.

The Android AAR ships consumer keep rules for UniFFI/JNA so a minified app can resolve JNI names and lay out JNA structs.

Library publish packages proguard.txt in the AAR. Minified-app R8 belongs in the consuming app.

Description

  • Keeps com.sun.jna.* so libjnidispatch can resolve JNI names on Native, Structure, and CallbackReference.
  • Keeps classes that extend com.sun.jna.*, including com.sun.jna.ptr ByReference types used as UniFFI callback out-params.
  • Keeps com.sun.jna.Structure$FieldOrder and annotated org.lightningdevkit.ldknode struct classes, fields, and constructors.
  • Fails bundleReleaseAar when the AAR is missing a non-empty proguard.txt.

Out of scope

  • Running R8 in this repo.

Preview

N/A — Android consumer keep rules only.

QA Notes

  • Release AAR contains a non-empty proguard.txt with those consumer keep rules.

R8 full mode stripped @structure.FieldOrder from UniFFI structs. Keep the
annotation type and annotated classes so JNA can still lay out the structs.
@ovitrif
ovitrif requested a review from ben-kaufman August 26, 2026 20:17

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b333b30b79

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread CHANGELOG.md Outdated
@@ -1,5 +1,6 @@
# Unreleased

- Android consumer keep rules now keep the JNA `Structure.FieldOrder` annotation type and annotated UniFFI struct classes through R8 full mode.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Move the entry into Synonym Fork Additions

This new Synonym-fork change is recorded under # Unreleased, but the repository requires all fork additions to remain in the single cumulative ## Synonym Fork Additions subsection, with new entries added at the top. Leaving it here fragments the release history and excludes the fix from the mandated cumulative section.

AGENTS.md reference: AGENTS.md:L257-L263

Useful? React with 👍 / 👎.

@ovitrif
ovitrif marked this pull request as draft August 26, 2026 20:39
@ovitrif ovitrif changed the title fix: keep JNA FieldOrder annotations under R8 fix: keep JNA JNI symbols in Android consumer rules Aug 26, 2026
@ovitrif ovitrif changed the title fix: keep JNA JNI symbols in Android consumer rules fix: android consumer-rules Aug 26, 2026
Ship FieldOrder and com.sun.jna.* keeps in the AAR. Library publish
packages proguard.txt so a minified app can resolve JNI names and
lay out JNA structs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

add android r8 consumer keep rules

1 participant