fix(dist-apk): link a project's res/ as the base, and pin android-platform 36-r2 - #21
Merged
Merged
Conversation
…tform 36-r2 Two defects an application with a launcher icon hits, measured by HuxerUI's Android row against 0.9.0. `-R` is aapt2's overlay: every resource in that unit must override one the base already defines. A project's `res/` IS the base, so its first colour failed with `color/ic_launcher_background does not override an existing resource`, and no icon, colour or string could be supplied at all. The compiled unit is now passed positionally. `xim:android-platform` was pinned at 35-r2 while the index has carried 36-r2 since openxlings/xim-pkgindex#834; a project declaring 36 for its own targetSdkVersion got a two-versions warning and the nearer pin. The option pins 36-r2, and the level-0 fixture manifest follows (`targetSdkVersion="36"` -- the one byte in it that is read from the platform, everything else is the template 0.8.0 rendered). `tests/apk-consumer` gains criterion (g): with APK_CONSUMER_RES set, its own `res/values/{strings,colors}.xml` -- two resources nothing else defines -- link, and `aapt2 dump resources` on the apk lists both. check-apk-features.sh (a) to (g) pass locally; HuxerUI's example 01 with a launcher `res/` packs to an APK carrying `res/mipmap-*`, `resources.arsc` and `application-icon-*` in its badging. Version 0.9.1.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two
dist-apkdefects an application with a launcher icon hits, measured by HuxerUI's Android row against 0.9.0.options::resourceswas linked as an aapt2 overlayaapt2 link -R <unit>is the overlay form: every resource in that unit must override one the base already defines. A project'sres/is the base, so its first colour failed withand no icon, colour or string could be supplied through the option at all. The compiled unit is now passed positionally (
dist/apk.cppm, the link step).xim:android-platformpinned 35-r2The index carries 36-r2 since openxlings/xim-pkgindex#834. A project declaring 36 for its own
targetSdkVersiongot a two-versions warning and the nearer pin won. The option pins 36-r2; the level-0 fixture manifest follows (targetSdkVersion="36"is the one byte in it read from the platform, everything else is the template 0.8.0 rendered — the check script says so).Tests
tests/apk-consumergains criterion (g): withAPK_CONSUMER_RESset, its ownres/values/{strings,colors}.xml(two resources nothing else defines) link, andaapt2 dump resourceson the apk lists both. The CI step runs the script as before, now (a) to (g).Local:
check-apk-features.sh(a)–(g) pass with mcpp 2026.9.13.1. End to end: HuxerUI's example 01 with a launcherres/(the SDK template's mipmaps) packed with this branch as a path dependency carriesres/mipmap-*,resources.arsc, andaapt2 dump badgingreportsapplication-icon-*andtargetSdkVersion:'36', with no two-versions warning.Version 0.9.1.