exclude src/ports/*CG* for all targets

We were not excluding it from iOS builds, which fails including MobileCoreServices.h.  (Odd!)

Also remove some redudant exclusions of src/ports/SkImageDecoder_CG.cpp, and sorts.

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

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

diff --git a/public.bzl b/public.bzl
index b06c1dd938a9208d5ee079cfda801ab9455f8057..2b07a30be506d5e2d5ffa0c253e496dd69a44366 100644 (file)
--- a/public.bzl
+++ b/public.bzl
@@ -149,8 +149,8 @@ BASE_SRCS_UNIX = struct(
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
-        "src/ports/*android*",
         "src/ports/*CG*",
+        "src/ports/*android*",
         "src/ports/*chromium*",
         "src/ports/*mac*",
         "src/ports/*mozalloc*",
@@ -161,7 +161,6 @@ BASE_SRCS_UNIX = struct(
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
         "src/ports/SkFontMgr_fontconfig.cpp",
-        "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkFontMgr_fontconfig_factory.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",
         "src/ports/SkImageDecoder_empty.cpp",
@@ -196,9 +195,9 @@ BASE_SRCS_ANDROID = struct(
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*CG*",
+        "src/ports/*FontConfig*",
         "src/ports/*chromium*",
         "src/ports/*fontconfig*",
-        "src/ports/*FontConfig*",
         "src/ports/*mac*",
         "src/ports/*mozalloc*",
         "src/ports/*nacl*",
@@ -209,7 +208,6 @@ BASE_SRCS_ANDROID = struct(
         "src/ports/SkFontMgr_custom_directory_factory.cpp",
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
-        "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",
         "src/ports/SkImageDecoder_empty.cpp",
         "src/ports/SkImageGenerator_none.cpp",
@@ -250,11 +248,12 @@ BASE_SRCS_IOS = struct(
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_arm*.cpp",
         "src/opts/SkBlitRow_opts_arm*.cpp",
+        "src/ports/*CG*",
+        "src/ports/*FontConfig*",
+        "src/ports/*FreeType*",
         "src/ports/*android*",
         "src/ports/*chromium*",
         "src/ports/*fontconfig*",
-        "src/ports/*FontConfig*",
-        "src/ports/*FreeType*",
         "src/ports/*mozalloc*",
         "src/ports/*nacl*",
         "src/ports/*win*",
@@ -264,7 +263,6 @@ BASE_SRCS_IOS = struct(
         "src/ports/SkFontMgr_custom_directory_factory.cpp",
         "src/ports/SkFontMgr_custom_embedded_factory.cpp",
         "src/ports/SkFontMgr_empty_factory.cpp",
-        "src/ports/SkImageDecoder_CG.cpp",
         "src/ports/SkImageDecoder_WIC.cpp",
         "src/ports/SkImageGenerator_none.cpp",
         "src/ports/SkTLS_none.cpp",