commit f1ba3ae6f7530897d0649066dc858943810a817a
author Florin Malita <fmalita@chromium.org> Thu Jul 19 15:09:11 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 19 19:43:25 2018 +0000
tree 41241c027664eb47b1183fbcc69e5605696f6781
parent a8046af0b0501e53726c01fa5ec2ec6590c79a82

[skottie] Update DM src name to "lottie"

Change-Id: I82ec9cace172ed254b7325ff315ac82f2ae30a35
Reviewed-on: https://skia-review.googlesource.com/142581
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 64ed4354..5e21e89 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -762,16 +762,22 @@
 }
 
 template <typename T>
-void gather_file_srcs(const SkCommandLineFlags::StringArray& flags, const char* ext) {
+void gather_file_srcs(const SkCommandLineFlags::StringArray& flags, const char* ext,
+                      const char* src_name = nullptr) {
+    if (!src_name) {
+        // With the exception of Lottie files, the source name is the extension.
+        src_name = ext;
+    }
+
     for (int i = 0; i < flags.count(); i++) {
         const char* path = flags[i];
         if (sk_isdir(path)) {
             SkOSFile::Iter it(path, ext);
             for (SkString file; it.next(&file); ) {
-                push_src(ext, "", new T(SkOSPath::Join(path, file.c_str())));
+                push_src(src_name, "", new T(SkOSPath::Join(path, file.c_str())));
             }
         } else {
-            push_src(ext, "", new T(path));
+            push_src(src_name, "", new T(path));
         }
     }
 }
@@ -784,7 +790,7 @@
     gather_file_srcs<SKPSrc>(FLAGS_skps, "skp");
     gather_file_srcs<MSKPSrc>(FLAGS_mskps, "mskp");
 #if defined(SK_ENABLE_SKOTTIE)
-    gather_file_srcs<SkottieSrc>(FLAGS_lotties, "json");
+    gather_file_srcs<SkottieSrc>(FLAGS_lotties, "json", "lottie");
 #endif
 #if defined(SK_XML)
     gather_file_srcs<SVGSrc>(FLAGS_svgs, "svg");