commit 3f193a9b9b6fc034f5eb83af973c4c4e4f2dfe26
author mtklein <mtklein@chromium.org> Thu Mar 10 08:52:05 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Mar 10 08:52:05 2016 -0800
tree a8ac3e70e889099bc0bd6e80cfbd0005486535a5
parent e2a88f244a1eba029a815fdb3ec520af37707de2

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

public.bzl

diff --git a/public.bzl b/public.bzl
index b06c1dd..2b07a30 100644
--- a/public.bzl
+++ b/public.bzl
@@ -149,8 +149,8 @@
         "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 @@
         "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 @@
         "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 @@
         "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 @@
         "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 @@
         "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",