This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Support loading flutter assets from dynamic patch #7308
Merged
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
This replicates similar logic found in ApkAssetProvider that locates assets by their short name in a sudbirectory inside of an archive file, instead of only at the root of archive.
sbaranov
changed the title
liyuqian
reviewed
Dec 27, 2018
| @@ -253,7 +253,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env, | |||
| const auto file_ext_index = bundlepath.rfind("."); | |||
| if (bundlepath.substr(file_ext_index) == ".zip") { | |||
| asset_manager->PushBack( | |||
| std::make_unique<blink::ZipAssetStore>(bundlepath)); | |||
| std::make_unique<blink::ZipAssetStore>(bundlepath, "flutter_assets")); | |||
There was a problem hiding this comment.
Is the new codestd::make_unique<blink::ZipAssetStore>(bundlepath, "flutter_assets")); equivalent to std::make_unique<blink::ZipAssetStore>("flutter_assets/" + bundlepath)); in the old code?
There was a problem hiding this comment.
Not equivalent because bundlepath is the path to the archive file, and directory is the path inside of the archive (just like in ApkAssetProvider).
assets/zip_asset_store.cc
Outdated
|
|
||
| std::stringstream file_name; | ||
| file_name << directory_.c_str() << "/" << asset_name; | ||
| auto found = stat_cache_.find(file_name.str()); |
There was a problem hiding this comment.
nit: I think auto found = stat_cache_.find(directory_ + "/" + asset_name); might be cleaner.
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 28, 2018
engine-flutter-autoroll
added a commit
to flutter/flutter
that referenced
this pull request
Dec 29, 2018
flutter/engine@1bd9d41...995e324 git log 1bd9d41..995e324 --no-merges --oneline 995e324 Roll src/third_party/skia f3e6b90461e4..aec8c7e280cb (1 commits) (flutter/engine#7326) 6f763fb Minor refactoring of dynamic patching code. (flutter/engine#7325) 868dc04 Support loading flutter assets from dynamic patch (flutter/engine#7308) The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff ([email protected]), and stop the roller if necessary.
kangwang1988
pushed a commit
to XianyuTech/flutter
that referenced
this pull request
Feb 12, 2019
flutter/engine@1bd9d41...995e324 git log 1bd9d41..995e324 --no-merges --oneline 995e324 Roll src/third_party/skia f3e6b90461e4..aec8c7e280cb (1 commits) (flutter/engine#7326) 6f763fb Minor refactoring of dynamic patching code. (flutter/engine#7325) 868dc04 Support loading flutter assets from dynamic patch (flutter/engine#7308) The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff ([email protected]), and stop the roller if necessary.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This replicates similar logic found in ApkAssetProvider that locates assets by their short name in a sudbirectory inside of an archive file, instead of only at the root of archive.