From 8c172ba397087850e9c4949a42ae558ebc6fdaf4 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Thu, 19 Jul 2018 13:27:49 -0400 Subject: [infra] Add infra support for Lottie Bug: skia:8136 Change-Id: I18c4ad549c52346ebfe23d172597d5da205e5c4d Reviewed-on: https://skia-review.googlesource.com/142105 Commit-Queue: Eric Boren Reviewed-by: Ben Wagner --- tools/flags/SkCommonFlags.cpp | 4 ++-- tools/flags/SkCommonFlags.h | 2 +- tools/viewer/Viewer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index ed4d169585..459f65579f 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -56,12 +56,12 @@ DEFINE_bool(disableDriverCorrectnessWorkarounds, false, "Disables all GPU driver #ifdef SK_BUILD_FOR_ANDROID DEFINE_string(skps, "/data/local/tmp/skps", "Directory to read skps from."); DEFINE_string(jpgs, "/data/local/tmp/resources", "Directory to read jpgs from."); -DEFINE_string(jsons, "/data/local/tmp/jsons", "Directory to read (Bodymovin) jsons from."); +DEFINE_string(lotties, "/data/local/tmp/lotties", "Directory to read (Bodymovin) jsons from."); DEFINE_string(nimas, "/data/local/tmp/nimas", "Directory to read NIMA animations from."); #else DEFINE_string(skps, "skps", "Directory to read skps from."); DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from."); -DEFINE_string(jsons, "jsons", "Directory to read (Bodymovin) jsons from."); +DEFINE_string(lotties, "lotties", "Directory to read (Bodymovin) jsons from."); DEFINE_string(nimas, "nimas", "Directory to read NIMA animations from."); #endif diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h index 10f90c0293..1bd4517337 100644 --- a/tools/flags/SkCommonFlags.h +++ b/tools/flags/SkCommonFlags.h @@ -26,7 +26,7 @@ DECLARE_bool(releaseAndAbandonGpuContext); DECLARE_string(skps); DECLARE_int32(skpViewportSize); DECLARE_string(jpgs); -DECLARE_string(jsons); +DECLARE_string(lotties); DECLARE_string(svgs); DECLARE_string(nimas); DECLARE_bool(nativeFonts); diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index bdb4459dc6..ae77233c9f 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -558,7 +558,7 @@ void Viewer::initSlides() { return sk_make_sp(name, path);} }, #if defined(SK_ENABLE_SKOTTIE) - { ".json", "skottie-dir", FLAGS_jsons, + { ".json", "skottie-dir", FLAGS_lotties, [](const SkString& name, const SkString& path) -> sk_sp { return sk_make_sp(name, path);} }, -- cgit v1.2.3