diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-26 12:41:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-26 12:41:27 -0700 |
| commit | 1b51e0ec466026794f96e2c476f0c7f9db0f13dc (patch) | |
| tree | 980d3047ae1ed0f949dc4bfa42dacbc1d6f84257 | |
| parent | e93393b311ce88a15f64bdde58c05ea874f881f4 (diff) | |
Move SkJSONCPP.h to tools. It tool-only.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184483003
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
TBR=reed@google.com
Review-Url: https://codereview.chromium.org/2184483003
| -rw-r--r-- | cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/SkJSONCPP.h (renamed from include/utils/SkJSONCPP.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9ecb504a86..7240d88d27 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -333,7 +333,7 @@ endforeach() # c++ example.o @skia_link_arguments.txt # skia.h -set (bad_files GrGLConfig_chrome.h SkJSONCPP.h SkParsePaint.h) +set (bad_files GrGLConfig_chrome.h) # make `c++ @skia_compile_arguments.txt include/skia.h` work. set (skia_h_path ${userconfig_directory}/skia.h) file (WRITE ${skia_h_path} "// skia.h generated by CMake.\n") diff --git a/include/utils/SkJSONCPP.h b/tools/SkJSONCPP.h index 6baf223610..6baf223610 100644 --- a/include/utils/SkJSONCPP.h +++ b/tools/SkJSONCPP.h |