diff --git a/shell/common/run_configuration.cc b/shell/common/run_configuration.cc index 902002dcf9c50f3d6aae9adad4d8010e5f20e3c2..de0aa1adc912668de8955bf79ee7dea4180a8c16 100644 --- a/shell/common/run_configuration.cc +++ b/shell/common/run_configuration.cc @@ -8,6 +8,7 @@ #include "flutter/assets/directory_asset_bundle.h" #include "flutter/fml/file.h" +#include "flutter/fml/unique_fd.h" #include "flutter/runtime/dart_vm.h" namespace flutter { @@ -17,8 +18,10 @@ RunConfiguration RunConfiguration::InferFromSettings( fml::RefPtr io_worker) { auto asset_manager = std::make_shared(); - asset_manager->PushBack(std::make_unique( - fml::Duplicate(settings.assets_dir))); + if (fml::UniqueFD::traits_type::IsValid(settings.assets_dir)) { + asset_manager->PushBack(std::make_unique( + fml::Duplicate(settings.assets_dir))); + } asset_manager->PushBack( std::make_unique(fml::OpenDirectory( diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc index 1a2002efe5d65f72bc39ce9a6c781838fccff34e..dffbb8dd0114f178a157ec553baf5574011d6ae5 100644 --- a/shell/platform/embedder/embedder.cc +++ b/shell/platform/embedder/embedder.cc @@ -631,13 +631,6 @@ FlutterEngineResult FlutterEngineRun(size_t version, } } - run_configuration.AddAssetResolver( - std::make_unique( - fml::Duplicate(settings.assets_dir))); - - run_configuration.AddAssetResolver( - std::make_unique(fml::OpenDirectory( - settings.assets_path.c_str(), false, fml::FilePermission::kRead))); if (!run_configuration.IsValid()) { return LOG_EMBEDDER_ERROR(kInvalidArguments); }