This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
Set SkSL asset manager in RunConfiguration ctor #17948
Merged
fluttergithubbot
merged 1 commit into
flutter:master
from
liyuqian:fix_android_sksl_asset_path
Apr 28, 2020
Merged
Set SkSL asset manager in RunConfiguration ctor #17948
fluttergithubbot
merged 1 commit into
flutter:master
from
liyuqian:fix_android_sksl_asset_path
Apr 28, 2020
Conversation
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
jonahwilliams
approved these changes
Apr 25, 2020
Contributor
jonahwilliams
left a comment
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!
Contributor
Author
|
@chinmaygarde : do you know how to best test this? It seems that "platform_view_android_jni" isn't test anywhere in our unit tests. |
02834a7 to
721fb03
Compare
Contributor
Author
|
@chinmaygarde : never mind. I just realized that there's no asset path in Android so we'll have to use the AssetManager directly. It's a breeze as we just moved from loading files in a path to loading a single json file (#17861). Now the unit test covers the case of Android construction of RunConfiguration. There's no way that one can start a shell without a RunConfiguration, right? |
863f1d0 to
967b0e0
Compare
liyuqian
referenced
this pull request
in jonahwilliams/flutter
Apr 27, 2020
chinmaygarde
approved these changes
Apr 27, 2020
Android doesn't use RunConfiguration::InferFromSettings, and there's no path for assets since it's using AAssetManager_open. So we will directly use the AssetManager and ensure its initialization during RunConfiguration construction.
967b0e0 to
aecb8a3
Compare
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Apr 28, 2020
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Apr 28, 2020
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Apr 28, 2020
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Apr 28, 2020
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Apr 28, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
cla: yes
platform-android
waiting for tree to go green
This PR is approved and tested, but waiting for the tree to be green to land.
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.
Previously, #17601 set the asset path if embedder APIs, RunConfigurations::InferFromSettings, or relevant service protocols are called. However, it turns out that Android uses none of them, so we need to add this. (The old PR #17601 was only tested with iOS devices and unit tests.)