commit 6e4d95f804e7edd918791f75ad32e85ddb1c9990
author Florin Malita <fmalita@chromium.org> Wed May 30 09:27:32 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 30 13:50:08 2018 +0000
tree bb327d249e699b7a7816af0ef007bb37a9e2b0d6
parent 137b87485508e3882968a10559c2cb389dcc93c5

Add Skottie support to Fiddle

Change-Id: I2d89c1340215b43476337c354057328c1bb2b8ff
Reviewed-on: https://skia-review.googlesource.com/130720
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 944d020..2d90ecc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1013,9 +1013,16 @@
     public_configs = [ ":skia.h_config" ]
     skia_h = "$target_gen_dir/skia.h"
     script = "gn/find_headers.py"
-    args = [ rebase_path("//bin/gn") ] + [ rebase_path("//") ] +
-           [ rebase_path(skia_h, root_build_dir) ] +
-           rebase_path(skia_public_includes)
+
+    # TODO: would be cool to not hard-code these here, but how?
+    module_public_includes = [
+      "modules/sksg/include",
+      "modules/skottie/include",
+    ]
+    args =
+        [ rebase_path("//bin/gn") ] + [ rebase_path("//") ] +
+        [ rebase_path(skia_h, root_build_dir) ] +
+        rebase_path(skia_public_includes) + rebase_path(module_public_includes)
     depfile = "$skia_h.deps"
     outputs = [
       skia_h,
@@ -1041,6 +1048,7 @@
         ":gpu_tool_utils",
         ":skia",
         ":skia.h",
+        "modules/skottie",
       ]
     }
   }
@@ -1054,6 +1062,7 @@
       deps = [
         ":skia",
         ":skia.h",
+        "modules/skottie",
       ]
     }
   }

modules/skottie/BUILD.gn

diff --git a/modules/skottie/BUILD.gn b/modules/skottie/BUILD.gn
index f704eb4..1e8ccb2 100644
--- a/modules/skottie/BUILD.gn
+++ b/modules/skottie/BUILD.gn
@@ -18,11 +18,17 @@
   if (skia_enable_skottie) {
     public_configs = [ ":public_config" ]
     sources = [
+      # TODO: move this to public
+      "include/Skottie.h",
       "src/Skottie.cpp",
       "src/SkottieAdapter.cpp",
+      "src/SkottieAdapter.h",
       "src/SkottieAnimator.cpp",
+      "src/SkottieAnimator.h",
       "src/SkottieJson.cpp",
+      "src/SkottieJson.h",
       "src/SkottieValue.cpp",
+      "src/SkottieValue.h",
     ]
     configs += [ "../../:skia_private" ]
     deps = [