Revert of Move SkPixelXorXfermode.h to include/client/android (patchset #5 id:80001...

Reason for revert:
GN woes

Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/aa9cb62901075e9d2858353cb041e5e6d4719614

TBR=scroggo@google.com,reed@google.com,djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index 2402ed1..fa1bf53 100644 (file)
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -20,7 +20,6 @@
       ],
       'include_dirs': [
         '../include/effects',
-        '../include/client/android',
         '../include/private',
         '../src/effects',
         '../src/opts',
@@ -29,7 +28,6 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/effects',
-          '../include/client/android',
         ],
       },
       'sources': [

diff --git a/gyp/effects.gypi b/gyp/effects.gypi
index 63644e7..af09357 100644 (file)
--- a/gyp/effects.gypi
+++ b/gyp/effects.gypi
@@ -56,6 +56,7 @@
     '<(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',
@@ -109,12 +110,10 @@
     '<(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 595bb36..cf5d162 100644 (file)
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -7,7 +7,6 @@
   '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 0c2d099..d685b2a 100644 (file)
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -15,7 +15,6 @@
       ],
       'include_dirs': [
         '../include/effects',
-        '../include/client/android',
         '../include/images',
         '../include/ports',
         '../include/private',

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

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