diff options
| -rw-r--r-- | gyp/tools.gyp | 15 | ||||
| -rw-r--r-- | gyp/utils.gypi | 1 | ||||
| -rw-r--r-- | include/gpu/GrBlend.h | 2 | ||||
| -rw-r--r-- | include/private/SkChecksum.h (renamed from src/core/SkChecksum.h) | 0 | ||||
| -rw-r--r-- | include/private/SkTHash.h (renamed from src/core/SkTHash.h) | 0 | ||||
| -rw-r--r-- | include/private/SkTLogic.h (renamed from src/utils/SkTLogic.h) | 0 | ||||
| -rw-r--r-- | include/views/SkOSWindow_Win.h | 4 |
7 files changed, 18 insertions, 4 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index e866346869..5f4830b46d 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -175,6 +175,7 @@ '../tools/skpdiff/skpdiff_util.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', # needed for SkTLList.h '../tools/', # needed for picture_utils::replace_char ], @@ -229,6 +230,7 @@ '../tools/skpmaker.cpp', ], 'include_dirs': [ + '../include/private', '../src/core', ], 'dependencies': [ @@ -271,6 +273,7 @@ '../tools/skpinfo.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', ], 'dependencies': [ @@ -297,6 +300,7 @@ '../tools/LazyDecodeBitmap.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', '../src/lazy/', '../tools/', @@ -316,6 +320,7 @@ '../tools/LazyDecodeBitmap.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', '../src/images', '../src/lazy', @@ -333,6 +338,7 @@ '../src/utils/SkLua.cpp', ], 'include_dirs': [ + '../include/private', # Lua exposes GrReduceClip which in turn requires src/core for SkTLList '../src/gpu/', '../src/core/', @@ -355,6 +361,7 @@ '../src/utils/SkLua.cpp', ], 'include_dirs': [ + '../include/private', # Lua exposes GrReduceClip which in turn requires src/core for SkTLList '../src/gpu/', '../src/core/', @@ -378,6 +385,7 @@ '../tools/render_pictures_main.cpp', ], 'include_dirs': [ + '../include/private', '../src/core', '../src/images', '../src/lazy', @@ -401,6 +409,7 @@ '../tools/bench_pictures_main.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', '../bench', '../src/lazy/', @@ -429,6 +438,7 @@ '../tools/LazyDecodeBitmap.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', '../src/images', '../src/lazy', @@ -456,6 +466,7 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ + '../include/private', '../src/core', '../src/images', '../src/lazy', @@ -498,6 +509,7 @@ '../tools/render_pdfs_main.cpp', ], 'include_dirs': [ + '../include/private', '../src/core', '../src/pipe/utils/', '../src/utils/', @@ -588,6 +600,7 @@ 'target_name': 'filter', 'type': 'executable', 'include_dirs' : [ + '../include/private', '../src/core', '../src/utils/debugger', ], @@ -715,6 +728,7 @@ '../src/utils/SkLua.cpp', ], 'include_dirs': [ + '../include/private', # Lua exposes GrReduceClip which in turn requires src/core for SkTLList '../src/gpu/', '../src/core/', @@ -778,6 +792,7 @@ '../tools/create_test_font.cpp', ], 'include_dirs': [ + '../include/private', '../src/core', ], 'dependencies': [ diff --git a/gyp/utils.gypi b/gyp/utils.gypi index 22f8652966..50f8ed618c 100644 --- a/gyp/utils.gypi +++ b/gyp/utils.gypi @@ -101,7 +101,6 @@ '<(skia_src_path)/utils/SkThreadUtils_win.cpp', '<(skia_src_path)/utils/SkThreadUtils_win.h', '<(skia_src_path)/utils/SkTFitsIn.h', - '<(skia_src_path)/utils/SkTLogic.h', #mac '<(skia_include_path)/utils/mac/SkCGUtils.h', diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h index c8b931da73..52a0300ee4 100644 --- a/include/gpu/GrBlend.h +++ b/include/gpu/GrBlend.h @@ -7,7 +7,7 @@ */ #include "GrTypes.h" -#include "../../src/utils/SkTLogic.h" +#include "../private/SkTLogic.h" #ifndef GrBlend_DEFINED #define GrBlend_DEFINED diff --git a/src/core/SkChecksum.h b/include/private/SkChecksum.h index 8eb1766ec0..8eb1766ec0 100644 --- a/src/core/SkChecksum.h +++ b/include/private/SkChecksum.h diff --git a/src/core/SkTHash.h b/include/private/SkTHash.h index ffcdea5329..ffcdea5329 100644 --- a/src/core/SkTHash.h +++ b/include/private/SkTHash.h diff --git a/src/utils/SkTLogic.h b/include/private/SkTLogic.h index d188242446..d188242446 100644 --- a/src/utils/SkTLogic.h +++ b/include/private/SkTLogic.h diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h index e7bba18205..85cfec14f8 100644 --- a/include/views/SkOSWindow_Win.h +++ b/include/views/SkOSWindow_Win.h @@ -10,9 +10,9 @@ #ifndef SkOSWindow_Win_DEFINED #define SkOSWindow_Win_DEFINED -#include "SkWindow.h" #include "../../src/core/SkFunction.h" -#include "../../src/core/SkTHash.h" +#include "../private/SkTHash.h" +#include "SkWindow.h" #if SK_ANGLE #include "EGL/egl.h" |