commit | 7d42c44cddee7b7a12fa7c59099e989995eabf3a | [log] [tgz] |
---|---|---|
author | Florin Malita <fmalita@chromium.org> | Thu Jun 14 16:16:01 2018 -0400 |
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Jun 14 21:21:14 2018 +0000 |
tree | 6e0d460c0a8fc7366ed76cc8f89f5c532d9d2678 | |
parent | 725d5ad257898c23ef27f4d7feaa545103932c03 [diff] [blame] |
[skottie] Switch to SkJSON Convert to SkJSON APIs and remove RapidJSON dependency. TBR= Change-Id: I5b4fd78821a443326e3a5b370748d840b80ef279 Reviewed-on: https://skia-review.googlesource.com/134612 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
diff --git a/modules/skjson/src/SkJSONBench.cpp b/modules/skjson/src/SkJSONBench.cpp index b9c3664..4ef1d6c 100644 --- a/modules/skjson/src/SkJSONBench.cpp +++ b/modules/skjson/src/SkJSONBench.cpp
@@ -55,7 +55,7 @@ DEF_BENCH( return new JsonBench; ) -#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) +#if (0) #include "rapidjson/document.h"