From b9f29d3553508a4dadb9f87572464898a32b48ca Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 28 Mar 2016 12:51:56 -0700 Subject: [PATCH] Teach SkyShell about .packages files SkyShell now supports --packages instead of --package-root. --- engine/src/flutter/sky/tools/sky_snapshot/loader.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/sky/tools/sky_snapshot/loader.cc b/engine/src/flutter/sky/tools/sky_snapshot/loader.cc index 5af35ec8155..111ccf1b594 100644 --- a/engine/src/flutter/sky/tools/sky_snapshot/loader.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/loader.cc @@ -69,16 +69,16 @@ void Loader::LoadPackagesMap(const base::FilePath& packages) { packages_ = base::MakeAbsoluteFilePath(packages); dependencies_.insert(packages_.AsUTF8Unsafe()); std::string packages_source; - if (!base::ReadFileToString(packages, &packages_source)) { + if (!base::ReadFileToString(packages_, &packages_source)) { fprintf(stderr, "error: Unable to load .packages file '%s'.\n", - packages.AsUTF8Unsafe().c_str()); + packages_.AsUTF8Unsafe().c_str()); exit(1); } packages_map_.reset(new tonic::PackagesMap()); std::string error; if (!packages_map_->Parse(packages_source, &error)) { fprintf(stderr, "error: Unable to parse .packages file '%s'.\n%s\n", - packages.AsUTF8Unsafe().c_str(), error.c_str()); + packages_.AsUTF8Unsafe().c_str(), error.c_str()); exit(1); } }