-
Notifications
You must be signed in to change notification settings - Fork 24.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add workaround for Android Gradle Plugin 3.2 change to asset dir #21409
Conversation
Android Gradle Plugin 3.2 uses a new intermediates/merged_assets directory instead of intermediates/assets. This workaround copies the javascript bundle to both directories for compatibility purposes.
Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need the corporate CLA signed. If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks! |
Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM - thanks for your PR! I'm waiting for another feedback then I'll proceed to merge :)
Got a second confirmation that this is a viable solution, thanks again :) @facebook-github-bot shipit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kelset is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
) Summary: Android Gradle Plugin 3.2 uses a new intermediates/merged_assets directory instead of intermediates/assets. This workaround copies the javascript bundle to both directories for compatibility purposes. Fixes #21132 Fixes #18357 Pull Request resolved: #21409 Differential Revision: D10141860 Pulled By: hramos fbshipit-source-id: 0fb20fcec67ec2bfd7a8d9052599bbc70464b466
…ebook#21409) Summary: Android Gradle Plugin 3.2 uses a new intermediates/merged_assets directory instead of intermediates/assets. This workaround copies the javascript bundle to both directories for compatibility purposes. Fixes facebook#21132 Fixes facebook#18357 Pull Request resolved: facebook#21409 Differential Revision: D10141860 Pulled By: hramos fbshipit-source-id: 0fb20fcec67ec2bfd7a8d9052599bbc70464b466
…ebook#21409) Summary: Android Gradle Plugin 3.2 uses a new intermediates/merged_assets directory instead of intermediates/assets. This workaround copies the javascript bundle to both directories for compatibility purposes. Fixes facebook#21132 Fixes facebook#18357 Pull Request resolved: facebook#21409 Differential Revision: D10141860 Pulled By: hramos fbshipit-source-id: 0fb20fcec67ec2bfd7a8d9052599bbc70464b466
Android Gradle Plugin 3.2 uses a new intermediates/merged_assets directory instead of intermediates/assets. This workaround copies the javascript bundle to both directories for compatibility purposes.
Fixes #21132
Fixes #18357
Test Plan:
Build and run release variant of react-native hello world with Android Studio 3.1.4 and 3.2 with and without jsBundleDirDebug set, observe that javascript bundle exists in built apk.
Release Notes:
Help reviewers and the release process by writing your own release notes. See below for an example.
[ANDROID] [BUGFIX] [react.gradle] - Make asset generation compatible with Android Gradle plugin 3.2 and later.