diff --git a/engine/src/flutter/sky/BUILD.gn b/engine/src/flutter/sky/BUILD.gn index ef3c9c8d317..a8c556640bd 100644 --- a/engine/src/flutter/sky/BUILD.gn +++ b/engine/src/flutter/sky/BUILD.gn @@ -10,7 +10,7 @@ group("sky") { "//sky/engine/wtf:unittests", "//sky/sdk/example", "//sky/tools/imagediff", - "//sky/tools/packager($host_toolchain)", + "//sky/tools/sky_snapshot($host_toolchain)", ":sky_dev", ] diff --git a/engine/src/flutter/sky/tools/sky_packager.py b/engine/src/flutter/sky/tools/sky_snapshot.py similarity index 91% rename from engine/src/flutter/sky/tools/sky_packager.py rename to engine/src/flutter/sky/tools/sky_snapshot.py index 7131365392a..8dd1d6a39b3 100755 --- a/engine/src/flutter/sky/tools/sky_packager.py +++ b/engine/src/flutter/sky/tools/sky_snapshot.py @@ -9,7 +9,7 @@ import sys import os def main(): - parser = argparse.ArgumentParser(description='Sky Packager') + parser = argparse.ArgumentParser(description='Snapshots Sky applications') parser.add_argument('executable', type=str) parser.add_argument('main', type=str) parser.add_argument('--package-root', type=str) diff --git a/engine/src/flutter/sky/tools/packager/BUILD.gn b/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn similarity index 89% rename from engine/src/flutter/sky/tools/packager/BUILD.gn rename to engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn index a8ad042ee93..7cd69742706 100644 --- a/engine/src/flutter/sky/tools/packager/BUILD.gn +++ b/engine/src/flutter/sky/tools/sky_snapshot/BUILD.gn @@ -2,9 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -executable("packager") { - output_name = "sky_packager" - +executable("sky_snapshot") { sources = [ "loader.cc", "loader.h", diff --git a/engine/src/flutter/sky/tools/packager/loader.cc b/engine/src/flutter/sky/tools/sky_snapshot/loader.cc similarity index 95% rename from engine/src/flutter/sky/tools/packager/loader.cc rename to engine/src/flutter/sky/tools/sky_snapshot/loader.cc index 397eacb345d..bac6edb9dce 100644 --- a/engine/src/flutter/sky/tools/packager/loader.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/loader.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/tools/packager/loader.h" +#include "sky/tools/sky_snapshot/loader.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "sky/tools/packager/logging.h" -#include "sky/tools/packager/scope.h" -#include "sky/tools/packager/switches.h" +#include "sky/tools/sky_snapshot/logging.h" +#include "sky/tools/sky_snapshot/scope.h" +#include "sky/tools/sky_snapshot/switches.h" namespace { diff --git a/engine/src/flutter/sky/tools/packager/loader.h b/engine/src/flutter/sky/tools/sky_snapshot/loader.h similarity index 76% rename from engine/src/flutter/sky/tools/packager/loader.h rename to engine/src/flutter/sky/tools/sky_snapshot/loader.h index da9b67a4e3c..4c075c0c0d6 100644 --- a/engine/src/flutter/sky/tools/packager/loader.h +++ b/engine/src/flutter/sky/tools/sky_snapshot/loader.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_TOOLS_PACKAGER_LOADER_H_ -#define SKY_TOOLS_PACKAGER_LOADER_H_ +#ifndef SKY_TOOLS_SKY_SNAPSHOT_LOADER_H_ +#define SKY_TOOLS_SKY_SNAPSHOT_LOADER_H_ #include @@ -14,4 +14,4 @@ Dart_Handle HandleLibraryTag(Dart_LibraryTag tag, Dart_Handle url); void LoadScript(const std::string& url); -#endif // SKY_TOOLS_PACKAGER_LOADER_H_ +#endif // SKY_TOOLS_SKY_SNAPSHOT_LOADER_H_ diff --git a/engine/src/flutter/sky/tools/packager/logging.cc b/engine/src/flutter/sky/tools/sky_snapshot/logging.cc similarity index 96% rename from engine/src/flutter/sky/tools/packager/logging.cc rename to engine/src/flutter/sky/tools/sky_snapshot/logging.cc index e61820cb972..89f1558bf83 100644 --- a/engine/src/flutter/sky/tools/packager/logging.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/logging.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/tools/packager/logging.h" +#include "sky/tools/sky_snapshot/logging.h" #include "base/logging.h" diff --git a/engine/src/flutter/sky/tools/packager/logging.h b/engine/src/flutter/sky/tools/sky_snapshot/logging.h similarity index 74% rename from engine/src/flutter/sky/tools/packager/logging.h rename to engine/src/flutter/sky/tools/sky_snapshot/logging.h index 227a9d8f5e9..881d91e45c0 100644 --- a/engine/src/flutter/sky/tools/packager/logging.h +++ b/engine/src/flutter/sky/tools/sky_snapshot/logging.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_TOOLS_PACKAGER_LOGGING_H_ -#define SKY_TOOLS_PACKAGER_LOGGING_H_ +#ifndef SKY_TOOLS_SKY_SNAPSHOT_LOGGING_H_ +#define SKY_TOOLS_SKY_SNAPSHOT_LOGGING_H_ #include @@ -13,4 +13,4 @@ bool LogIfError(Dart_Handle handle); std::string StringFromDart(Dart_Handle string); Dart_Handle StringToDart(const std::string& string); -#endif // SKY_TOOLS_PACKAGER_LOGGING_H_ +#endif // SKY_TOOLS_SKY_SNAPSHOT_LOGGING_H_ diff --git a/engine/src/flutter/sky/tools/packager/main.cc b/engine/src/flutter/sky/tools/sky_snapshot/main.cc similarity index 88% rename from engine/src/flutter/sky/tools/packager/main.cc rename to engine/src/flutter/sky/tools/sky_snapshot/main.cc index 7b20c436a4f..3d095b28406 100644 --- a/engine/src/flutter/sky/tools/packager/main.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/main.cc @@ -12,11 +12,11 @@ #include "base/logging.h" #include "base/process/memory.h" #include "dart/runtime/include/dart_api.h" -#include "sky/tools/packager/loader.h" -#include "sky/tools/packager/logging.h" -#include "sky/tools/packager/scope.h" -#include "sky/tools/packager/switches.h" -#include "sky/tools/packager/vm.h" +#include "sky/tools/sky_snapshot/loader.h" +#include "sky/tools/sky_snapshot/logging.h" +#include "sky/tools/sky_snapshot/scope.h" +#include "sky/tools/sky_snapshot/switches.h" +#include "sky/tools/sky_snapshot/vm.h" void Usage() { std::cerr << "Usage: sky_packager" diff --git a/engine/src/flutter/sky/tools/packager/scope.h b/engine/src/flutter/sky/tools/sky_snapshot/scope.h similarity index 85% rename from engine/src/flutter/sky/tools/packager/scope.h rename to engine/src/flutter/sky/tools/sky_snapshot/scope.h index b039d24dcc5..d4acd993e7e 100644 --- a/engine/src/flutter/sky/tools/packager/scope.h +++ b/engine/src/flutter/sky/tools/sky_snapshot/scope.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_TOOLS_PACKAGER_SCOPE_H_ -#define SKY_TOOLS_PACKAGER_SCOPE_H_ +#ifndef SKY_TOOLS_SKY_SNAPSHOT_SCOPE_H_ +#define SKY_TOOLS_SKY_SNAPSHOT_SCOPE_H_ #include "base/basictypes.h" #include "base/logging.h" @@ -30,4 +30,4 @@ class DartApiScope { DISALLOW_COPY_AND_ASSIGN(DartApiScope); }; -#endif // SKY_TOOLS_PACKAGER_SCOPE_H_ +#endif // SKY_TOOLS_SKY_SNAPSHOT_SCOPE_H_ diff --git a/engine/src/flutter/sky/tools/packager/switches.cc b/engine/src/flutter/sky/tools/sky_snapshot/switches.cc similarity index 87% rename from engine/src/flutter/sky/tools/packager/switches.cc rename to engine/src/flutter/sky/tools/sky_snapshot/switches.cc index 664055f5456..992d34c544d 100644 --- a/engine/src/flutter/sky/tools/packager/switches.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/tools/packager/switches.h" +#include "sky/tools/sky_snapshot/switches.h" namespace switches { diff --git a/engine/src/flutter/sky/tools/packager/switches.h b/engine/src/flutter/sky/tools/sky_snapshot/switches.h similarity index 70% rename from engine/src/flutter/sky/tools/packager/switches.h rename to engine/src/flutter/sky/tools/sky_snapshot/switches.h index 0a5d1be7efd..fd758fdc50f 100644 --- a/engine/src/flutter/sky/tools/packager/switches.h +++ b/engine/src/flutter/sky/tools/sky_snapshot/switches.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_TOOLS_PACKAGER_SWITCHES_H_ -#define SKY_TOOLS_PACKAGER_SWITCHES_H_ +#ifndef SKY_TOOLS_SKY_SNAPSHOT_SWITCHES_H_ +#define SKY_TOOLS_SKY_SNAPSHOT_SWITCHES_H_ namespace switches { @@ -13,4 +13,4 @@ extern const char kSnapshot[]; } // namespace switches -#endif // SKY_TOOLS_PACKAGER_SWITCHES_H_ +#endif // SKY_TOOLS_SKY_SNAPSHOT_SWITCHES_H_ diff --git a/engine/src/flutter/sky/tools/packager/vm.cc b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc similarity index 89% rename from engine/src/flutter/sky/tools/packager/vm.cc rename to engine/src/flutter/sky/tools/sky_snapshot/vm.cc index b4cb8e903eb..7fc57deeda0 100644 --- a/engine/src/flutter/sky/tools/packager/vm.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/vm.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/tools/packager/vm.h" +#include "sky/tools/sky_snapshot/vm.h" #include "base/logging.h" -#include "sky/tools/packager/loader.h" -#include "sky/tools/packager/logging.h" +#include "sky/tools/sky_snapshot/loader.h" +#include "sky/tools/sky_snapshot/logging.h" namespace blink { extern const uint8_t* kDartVmIsolateSnapshotBuffer; diff --git a/engine/src/flutter/sky/tools/packager/vm.h b/engine/src/flutter/sky/tools/sky_snapshot/vm.h similarity index 69% rename from engine/src/flutter/sky/tools/packager/vm.h rename to engine/src/flutter/sky/tools/sky_snapshot/vm.h index 681fbc9e315..7af43b96a89 100644 --- a/engine/src/flutter/sky/tools/packager/vm.h +++ b/engine/src/flutter/sky/tools/sky_snapshot/vm.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_TOOLS_PACKAGER_VM_H_ -#define SKY_TOOLS_PACKAGER_VM_H_ +#ifndef SKY_TOOLS_SKY_SNAPSHOT_VM_H_ +#define SKY_TOOLS_SKY_SNAPSHOT_VM_H_ #include "dart/runtime/include/dart_api.h" void InitDartVM(); Dart_Isolate CreateDartIsolate(); -#endif // SKY_TOOLS_PACKAGER_VM_H_ +#endif // SKY_TOOLS_SKY_SNAPSHOT_VM_H_