diff options
| author |  robertphillips <robertphillips@google.com> | 2016-02-01 04:54:14 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-01 04:54:15 -0800 |
| commit | 188d44c5496c64fe06e02ba00a3e983200fa6c88 (patch) | |
| tree | 051b42d1b1ee2fcac965f9bda35643d8698aa85c /gyp | |
| parent | d2a4271c753546c59607ad335807f5950ec96cc5 (diff) | |
Move SkPixelXorXfermode.h to include/client/android
This intended to make clients aware that the SkPixelXorXfermode is Android-specific
This needs to land after the Chromium CL https://codereview.chromium.org/1647953006/ (Add include/client/android to skia .gn & .gypi files)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1645093002
Committed: https://skia.googlesource.com/skia/+/aa9cb62901075e9d2858353cb041e5e6d4719614
Review URL: https://codereview.chromium.org/1645093002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/effects.gyp | 2 | ||||
| -rw-r--r-- | gyp/effects.gypi | 5 | ||||
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/ports.gyp | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/gyp/effects.gyp b/gyp/effects.gyp index fa1bf537fd..2402ed1c44 100644 --- a/gyp/effects.gyp +++ b/gyp/effects.gyp @@ -20,6 +20,7 @@ ], 'include_dirs': [ '../include/effects', + '../include/client/android', '../include/private', '../src/effects', '../src/opts', @@ -28,6 +29,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '../include/effects', + '../include/client/android', ], }, 'sources': [ diff --git a/gyp/effects.gypi b/gyp/effects.gypi index cee399d6e7..ea750b9bca 100644 --- a/gyp/effects.gypi +++ b/gyp/effects.gypi @@ -85,7 +85,6 @@ '<(skia_include_path)/effects/Sk2DPathEffect.h', '<(skia_include_path)/effects/SkAlphaThresholdFilter.h', '<(skia_include_path)/effects/SkArithmeticMode.h', - '<(skia_include_path)/effects/SkAvoidXfermode.h', '<(skia_include_path)/effects/SkBlurDrawLooper.h', '<(skia_include_path)/effects/SkBlurImageFilter.h', '<(skia_include_path)/effects/SkBlurMaskFilter.h', @@ -112,10 +111,12 @@ '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', '<(skia_include_path)/effects/SkPaintImageFilter.h', '<(skia_include_path)/effects/SkPerlinNoiseShader.h', - '<(skia_include_path)/effects/SkPixelXorXfermode.h', '<(skia_include_path)/effects/SkTableColorFilter.h', '<(skia_include_path)/effects/SkTableMaskFilter.h', '<(skia_include_path)/effects/SkTileImageFilter.h', '<(skia_include_path)/effects/SkXfermodeImageFilter.h', + + '<(skia_include_path)/client/android/SkAvoidXfermode.h', + '<(skia_include_path)/client/android/SkPixelXorXfermode.h', ], } diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index cf5d162973..595bb36a79 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -7,6 +7,7 @@ 'include_dirs': [ '../gm', # include dirs needed by particular GMs + '../include/client/android', '../src/utils/debugger', '../src/images', '../src/lazy', diff --git a/gyp/ports.gyp b/gyp/ports.gyp index d685b2acb6..0c2d099380 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -15,6 +15,7 @@ ], 'include_dirs': [ '../include/effects', + '../include/client/android', '../include/images', '../include/ports', '../include/private', |