aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cmake/CMakeLists.txt2
-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