AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[skottie] Update DM src name to "lottie"

Browse Source 
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>
This commit is contained in:
Florin Malita 2018-07-19 15:09:11 -04:00 committed by Skia Commit-Bot
parent a8046af0b0
commit f1ba3ae6f7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dm/DM.cpp
View File

@ -762,16 +762,22 @@ static void push_codec_srcs(Path path) {
} }
template <typename T> 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++) { for (int i = 0; i < flags.count(); i++) {
const char* path = flags[i]; const char* path = flags[i];
if (sk_isdir(path)) { if (sk_isdir(path)) {
SkOSFile::Iter it(path, ext); SkOSFile::Iter it(path, ext);
for (SkString file; it.next(&file); ) { 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 { } else {
push_src(ext, "", new T(path)); push_src(src_name, "", new T(path));
} }
} }
} }
@ -784,7 +790,7 @@ static bool gather_srcs() {
gather_file_srcs<SKPSrc>(FLAGS_skps, "skp"); gather_file_srcs<SKPSrc>(FLAGS_skps, "skp");
gather_file_srcs<MSKPSrc>(FLAGS_mskps, "mskp"); gather_file_srcs<MSKPSrc>(FLAGS_mskps, "mskp");
#if defined(SK_ENABLE_SKOTTIE) #if defined(SK_ENABLE_SKOTTIE)
gather_file_srcs<SkottieSrc>(FLAGS_lotties, "json"); gather_file_srcs<SkottieSrc>(FLAGS_lotties, "json", "lottie");
#endif #endif
#if defined(SK_XML) #if defined(SK_XML)
gather_file_srcs<SVGSrc>(FLAGS_svgs, "svg"); gather_file_srcs<SVGSrc>(FLAGS_svgs, "svg");