diff options
| author | Florin Malita <fmalita@chromium.org> | 2018-06-19 11:27:20 -0400 |
|---|---|---|
| committer | Kevin Lubick <kjlubick@google.com> | 2018-06-19 18:23:30 +0000 |
| commit | 80452bee11ebe6708ea459ea34e526a44c04bdb0 (patch) | |
| tree | 2e74fe66a6554f81909188b423f7ce4055cdaea3 /gn | |
| parent | 96aa535b782f31df0f063213c2958acba32a808d (diff) | |
| download | skqp-80452bee11ebe6708ea459ea34e526a44c04bdb0.tar.gz | |
Fold SkJSON into Skia/utils
It's a tiny, core-ish component -- might as well treat as such to
simplify dependencies.
Change-Id: I6f31ce2d151f9a629d88bfc7f15d64891d5150c0
Reviewed-on: https://skia-review.googlesource.com/135780
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/bench.gni | 1 | ||||
| -rw-r--r-- | gn/tests.gni | 1 | ||||
| -rw-r--r-- | gn/utils.gni | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/gn/bench.gni b/gn/bench.gni index e73a973ccb..ab1870308c 100644 --- a/gn/bench.gni +++ b/gn/bench.gni @@ -63,6 +63,7 @@ bench_sources = [ "$_bench/ImageFilterCollapse.cpp", "$_bench/ImageFilterDAGBench.cpp", "$_bench/InterpBench.cpp", + "$_bench/JSONBench.cpp", "$_bench/LightingBench.cpp", "$_bench/LineBench.cpp", "$_bench/MagnifierBench.cpp", diff --git a/gn/tests.gni b/gn/tests.gni index 5f028e8f45..32c3337adc 100644 --- a/gn/tests.gni +++ b/gn/tests.gni @@ -123,6 +123,7 @@ tests_sources = [ "$_tests/InterpolatorTest.cpp", "$_tests/InvalidIndexedPngTest.cpp", "$_tests/IsClosedSingleContourTest.cpp", + "$_tests/JSONTest.cpp", "$_tests/LayerDrawLooperTest.cpp", "$_tests/LazyProxyTest.cpp", "$_tests/LListTest.cpp", diff --git a/gn/utils.gni b/gn/utils.gni index ff8f60a56c..63b063bf46 100644 --- a/gn/utils.gni +++ b/gn/utils.gni @@ -38,6 +38,8 @@ skia_utils_sources = [ "$_src/utils/SkFloatToDecimal.h", "$_src/utils/SkFloatUtils.h", "$_src/utils/SkInterpolator.cpp", + "$_src/utils/SkJSON.cpp", + "$_src/utils/SkJSON.h", "$_src/utils/SkJSONWriter.cpp", "$_src/utils/SkJSONWriter.h", "$_src/utils/SkMatrix22.cpp", |