Remove image decoder and encoder autoregistration

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 9cb559e5478920bfcd7e144bb6cf7997108d8e1e..09c352de1575e5219242bafd0acda0252a279b29 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -27,7 +27,6 @@
       ],
       'sources': [
         '../include/images/SkDecodingImageGenerator.h',
-        '../include/images/SkForceLinking.h',
         '../src/images/SkJpegUtility.h',
         '../include/images/SkMovie.h',
         '../include/images/SkPageFlipper.h',
@@ -36,22 +35,8 @@
         '../src/images/bmpdecoderhelper.h',
 
         '../src/images/SkDecodingImageGenerator.cpp',
-        '../src/images/SkForceLinking.cpp',
         '../src/images/SkImageDecoder.cpp',
-        '../src/images/SkImageDecoder_FactoryDefault.cpp',
-        '../src/images/SkImageDecoder_FactoryRegistrar.cpp',
-
-        # If decoders are added/removed to/from (all/individual)
-        # platform(s), be sure to update SkForceLinking.cpp
-        # so the right decoders will be forced to link.
-
-        # IMPORTANT: The build order of the SkImageDecoder_*.cpp files

[scroggo, 2014/11/12 18:00:12]

Generally, we keep these in alphabetical order. Since this deviation is no
longer useful, please alphabetize.

[Kimmo Kinnunen, 2014/11/18 08:29:44]

Done.

-        # defines the order image decoders are tested when decoding a
-        # stream. The last decoder is the first one tested, so the .cpp
-        # files should be in listed in order from the least likely to be
-        # used, to the most likely (jpeg and png should be the last two
-        # for instance.) As a result, they are deliberately not in
-        # alphabetical order.
+        '../src/images/SkImageDecoder_Factory.cpp',
         '../src/images/SkImageDecoder_wbmp.cpp',
         '../src/images/SkImageDecoder_pkm.cpp',
         '../src/images/SkImageDecoder_ktx.cpp',
@@ -73,7 +58,6 @@
         '../src/images/SkScaledBitmapSampler.cpp',
         '../src/images/SkScaledBitmapSampler.h',
 
-
         '../src/images/SkImagesSupport.h',
         '../src/ports/SkImagesSupport_default.cpp',
         '../src/ports/SkImageDecoder_CG.cpp',
@@ -81,8 +65,10 @@
       ],
       'conditions': [
         [ 'skia_os == "win"', {
+          'include_dirs': [
+            '../src/ports',
+          ],
           'sources!': [
-            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkMovie_gif.cpp',
@@ -98,8 +84,10 @@
           ],
         }],
         [ 'skia_os in ["mac", "ios"]', {
+          'include_dirs': [
+            '../src/ports',
+          ],
           'sources!': [
-            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',