Fix #3962: Embed proguard.map in optimized AAB builds #3973
Conversation
This file contains 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
BenHenning
added
the
PR: Cherrypick requested
|
@anandwana001 PTAL as a full reviewer. |
anandwana001
approved these changes
Oct 27, 2021
There was a problem hiding this comment.
LGTM,
@BenHenning Just to confirm, am I looking at the correct file here?
|
Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks! |
That's correct @anandwana001 -- thanks for checking & for the review! |
|
Merging since it seems that there are no outstanding items. |
BenHenning
deleted the
add-support-for-embedding-proguard-map-file-in-aab
branch
BenHenning
added a commit
that referenced
this pull request
Oct 27, 2021
This was referenced Oct 27, 2021
BenHenning
added a commit
that referenced
this pull request
Oct 29, 2021
#3975) * Fix #3946: Fix solution automatically revealing after first hint reveal (#3955) * Fix solution auto showing after hint reveal. See #3946 & PR for specifics. * Add translations for new hint/solution. * Lint fixes. * Add TODO. * Fix Gradle-variant tests. * Fix #3937: Ensure ViewEventLogsViewModel builds for alpha builds (#3957) * Ensure ViewEventLogsViewModel builds for alpha. * BUILD file lint fix. * Fix #3939 & #3938: Fix KitKat crash & SVG rendering issues (#3963) * Fix KitKat crash when opening Help menu. * Fix SVG rendering on SDKs 19-23 (incl). * Add regex check to prohibit Delegates. * Lint fixes. * Add exemption for regex script test. * Update file_content_validation_checks.textproto Grammar fix in error. * Update RegexPatternValidationCheckTest.kt Copy grammar fix to test copy of error. * Update version.bzl (#3964) Bump version codes for another RC of release-0.6. * Embed proguard.map in optimized AAB builds. (#3973)
BenHenning
added
the
PR: Cherrypick completed
|
This is verified as working on the release-0.6 build. |
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.
Explanation
Fix #3962
This PR updates the oppia_android_application macro to support embedding the generated proguard.map file in optimized builds within the AAB. This is something that Gradle does, and it's especially convenient since it'll make both archiving & uploading the build to Play Store overall nicer. To verify that it works, download the alpha build from the CI artifacts and open it in a zip/archive viewer to see the proguard.map file under the top-level BUNDLE-METADATA directory.
APK and non-optimized AAB builds should be uanffected.
Note that the specific solution here came after multiple iterations of trying to determine how Gradle went about embedding the file since bundletool wasn't making it simple to add the metadata directory. The final solution was to add a new stage at the end of the pipeline to update the generated AAB to include the directory, though this needed to be done such that no directories were added themselves as zip entries (since this breaks bundletool). See google/bundletool#251 for a more detailed description of the issues discovered as part of this PR.
No tests are added since this is a Bazel infrastructure-only change, and we don't currently have tests for our Starlark rules. Manual verification should suffice.
Finally, I updated the other rules to accept single inputs since none of them actually pass multiple inputs. And, I'm planning to cherry-pick this into the release-0.6 branch to make the release archiving & upload easier, even though #3962 is not actually a release blocker.
Essential Checklist
For UI-specific PRs only
N/A -- infrastructural change that doesn't affect any user flows