Improve Android Core Library Desugaring trait - #910
Merged
Conversation
ktoso
approved these changes
Sep 4, 2026
Merged
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.
The previous work we had done for Android core library desugaring was purely a compile-time thing. However, it should really be a runtime thing. For example, if you have two apps:
minSdk: 23minSdk: 24On App A,
java.util.Optionalis desugared toj$.util.OptionalOn App B,
java.util.Optionalis availablePreviously, our trait would embed the desugared name into the binary That would mean if we enabled the trait to allow
Optionaluse on API 23, then the same binary would fail on a project withminSdk: 24.This PR refactors the trait to instead be a runtime "probe", that checks whether the desugared is available or not, and caches that for future use.
It also fixes a bug where we would not use the desugared name in
JNIMethodCache, which would results in crashes for collections of optionals for example.