aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-05-04 15:10:54 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-04 19:58:13 +0000
commitfa7e9a813e44f283b14f686eeb857d0d00735811 (patch)
tree8524acb13c15e157b644379862292f0e2f910a40 /BUILD.gn
parent0b0d93dbe432b6de4fd8df9a84e2ba3f2cc5b07e (diff)
[skottie] Switch to RapidJSON
- pull latest RapidJSON under third_party/externals/rapidjson (note: and older RS version is already pulled as part of angle2, and it is also checked in G3) - add a thin Json porting layer (SkottieJson) to isolate RS idiosyncrasies - convert Skottie to use the new helpers - parse the DOM in-place (based on local experiments this is the fastest method) Ta-da: Skottie now parses JSON ~10x faster! Change-Id: Ida9099638f88ed025fee83055c8cd8680ee27176 Reviewed-on: https://skia-review.googlesource.com/125744 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn5
1 files changed, 2 insertions, 3 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 4ce762529f..66dac2c237 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1446,7 +1446,6 @@ if (skia_enable_tools) {
test_lib("experimental_skottie") {
public_include_dirs = []
- include_dirs = [ "tools" ]
if (skia_enable_skottie) {
public_include_dirs += [ "experimental/skottie" ]
public_defines = [ "SK_ENABLE_SKOTTIE" ]
@@ -1454,13 +1453,13 @@ if (skia_enable_tools) {
"experimental/skottie/Skottie.cpp",
"experimental/skottie/SkottieAdapter.cpp",
"experimental/skottie/SkottieAnimator.cpp",
- "experimental/skottie/SkottieParser.cpp",
+ "experimental/skottie/SkottieJson.cpp",
"experimental/skottie/SkottieValue.cpp",
]
deps = [
":experimental_sksg",
":skia",
- "//third_party/jsoncpp",
+ "//third_party/rapidjson",
]
}
}