Repository navigation
[release/11.0.1xx] Keep generated AAPT2 rules in R8 inputs on incremental builds - #12974
Merged
jonathanpeppers merged 1 commit intoOct 1, 2026
Merged
Conversation
## Summary - Register the merged `aapt_rules.txt` as `ProguardConfiguration` and `FileWrites` in `_CreateBaseApk`, whose item groups are evaluated even when the target is up to date. Previously `_CreateBaseApkWithAapt2` was not invoked on an incremental build, dropping AAPT2 keep rules from R8's configuration. - Compute the rules path in `_CreateBaseApkInputs` so the AAPT2 link task and the consuming target use the same path. - Add an integration test with `AndroidLinkTool=r8` and `TrimMode=full` that failed before the fix and passes on an initial build and two successive incremental builds that rerun R8 without relinking resources. It also verifies incremental cleanup preserves the rules file. ## Validation - Full `Microsoft.Android.slnx` build succeeded with the repository's pinned SDK. - Targeted regression test: 1 passed after the change (failed before it). - Existing AAPT2 link tests: 2 passed. - Rebuilt SDK package contains the updated targets. This reproduces and fixes the dropped-rules incremental path; the issue's intermittent clean-CI trigger was not independently reproduced. Related to #12942 Co-authored-by: Copilot App <[email protected]>
github-actions
Bot
requested review from
jonathanpeppers and
simonrozsival
as code owners
October 1, 2026 14:15
jonathanpeppers
approved these changes
Oct 1, 2026
23 of 32 tasks
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
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.
Backport of #12950 to release/11.0.1xx
/cc @jonathanpeppers