Move SkPixelXorXfermode.h to include/client/android

This intended to make clients aware that the SkPixelXorXfermode is Android-specific

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1645093002

Review URL: https://codereview.chromium.org/1645093002

diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index fa1bf53..2402ed1 100644 (file)
--- 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 af09357..63644e7 100644 (file)
--- a/gyp/effects.gypi
+++ b/gyp/effects.gypi
@@ -56,7 +56,6 @@
     '<(skia_src_path)/effects/SkPaintImageFilter.cpp',
     '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp',
     '<(skia_src_path)/effects/SkPictureImageFilter.cpp',
-    '<(skia_src_path)/effects/SkPixelXorXfermode.cpp',
     '<(skia_src_path)/effects/SkTableColorFilter.cpp',
     '<(skia_src_path)/effects/SkTableMaskFilter.cpp',
     '<(skia_src_path)/effects/SkTestImageFilters.cpp',
@@ -110,10 +109,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/SkPixelXorXfermode.h',
+    '<(skia_src_path)/android/effects/SkPixelXorXfermode.cpp',
   ],
 }

diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index cf5d162..595bb36 100644 (file)
--- 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 d685b2a..0c2d099 100644 (file)
--- 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',

diff --git a/include/effects/SkPixelXorXfermode.h b/include/client/android/SkPixelXorXfermode.h
similarity index 100%
rename from include/effects/SkPixelXorXfermode.h
rename to include/client/android/SkPixelXorXfermode.h

diff --git a/src/effects/SkPixelXorXfermode.cpp b/src/android/effects/SkPixelXorXfermode.cpp
similarity index 100%
rename from src/effects/SkPixelXorXfermode.cpp
rename to src/android/effects/SkPixelXorXfermode.cpp