Remove image decoder and encoder autoregistration

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 13cf3bbf9a8c1aff95940c72d98d34558b32fc40..5d0731039505095a54b63122539357f75c883345 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -24,62 +24,62 @@
       ],
       'sources': [
         '../include/images/SkDecodingImageGenerator.h',
-        '../include/images/SkForceLinking.h',
-        '../src/images/SkJpegUtility.h',
         '../include/images/SkMovie.h',
         '../include/images/SkPageFlipper.h',
-
-        '../src/images/bmpdecoderhelper.cpp',
-        '../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
-        # 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_wbmp.cpp',
-        '../src/images/SkImageDecoder_pkm.cpp',
-        '../src/images/SkImageDecoder_ktx.cpp',
+        '../src/images/SkImageDecoder_Factory.cpp',
         '../src/images/SkImageDecoder_astc.cpp',
+        '../src/images/SkImageDecoder_astc.h',
+        '../src/images/SkImageDecoder_ktx.cpp',
+        '../src/images/SkImageDecoder_ktx.h',
         '../src/images/SkImageDecoder_libbmp.cpp',
+        '../src/images/SkImageDecoder_libbmp.h',
         '../src/images/SkImageDecoder_libgif.cpp',
+        '../src/images/SkImageDecoder_libgif.h',
         '../src/images/SkImageDecoder_libico.cpp',
-        '../src/images/SkImageDecoder_libwebp.cpp',
+        '../src/images/SkImageDecoder_libico.h',
         '../src/images/SkImageDecoder_libjpeg.cpp',
+        '../src/images/SkImageDecoder_libjpeg.h',
         '../src/images/SkImageDecoder_libpng.cpp',
-
+        '../src/images/SkImageDecoder_libpng.h',
+        '../src/images/SkImageDecoder_libwebp.cpp',
+        '../src/images/SkImageDecoder_libwebp.h',
+        '../src/images/SkImageDecoder_pkm.cpp',
+        '../src/images/SkImageDecoder_pkm.h',
+        '../src/images/SkImageDecoder_wbmp.cpp',
+        '../src/images/SkImageDecoder_wbmp.h',
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',
         '../src/images/SkImageEncoder_argb.cpp',
+        '../src/images/SkImageEncoder_argb.h',
         '../src/images/SkJpegUtility.cpp',
+        '../src/images/SkJpegUtility.h',
         '../src/images/SkMovie.cpp',
         '../src/images/SkMovie_gif.cpp',
+        '../src/images/SkMovie_gif.h',
         '../src/images/SkPageFlipper.cpp',
         '../src/images/SkScaledBitmapSampler.cpp',
         '../src/images/SkScaledBitmapSampler.h',
-
+        '../src/images/bmpdecoderhelper.cpp',
+        '../src/images/bmpdecoderhelper.h',
         '../src/ports/SkImageDecoder_CG.cpp',
+        '../src/ports/SkImageDecoder_CG.h',
         '../src/ports/SkImageDecoder_WIC.cpp',
+        '../src/ports/SkImageDecoder_WIC.h',
       ],
       'conditions': [
         [ 'skia_os == "win"', {
+          'include_dirs': [
+            '../src/ports',
+          ],
           'sources!': [
-            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libgif.h',
             '../src/images/SkImageDecoder_libpng.cpp',
+            '../src/images/SkImageDecoder_libpng.h',
             '../src/images/SkMovie_gif.cpp',
+            '../src/images/SkMovie_gif.h',
           ],
           'link_settings': {
             'libraries': [
@@ -89,18 +89,25 @@
         },{ #else if skia_os != win
           'sources!': [
             '../src/ports/SkImageDecoder_WIC.cpp',
+            '../src/ports/SkImageDecoder_WIC.h',
           ],
         }],
         [ 'skia_os in ["mac", "ios"]', {
+          'include_dirs': [
+            '../src/ports',
+          ],
           'sources!': [
-            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
+            '../src/images/SkImageDecoder_libpng.h',
             '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libgif.h',
             '../src/images/SkMovie_gif.cpp',
+            '../src/images/SkMovie_gif.h',
           ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageDecoder_CG.cpp',
+            '../src/ports/SkImageDecoder_CG.h',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
@@ -120,7 +127,9 @@
         [ 'skia_os == "nacl"', {
           'sources!': [
             '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libgif.h',
             '../src/images/SkMovie_gif.cpp',
+            '../src/images/SkMovie_gif.h',
           ],
         }],
         [ 'skia_os == "android"', {
@@ -142,8 +151,11 @@
               # Java applications that can't take advantage of the compressed formats.
               'sources!': [
                 '../src/images/SkImageDecoder_pkm.cpp',
+                '../src/images/SkImageDecoder_pkm.h',
                 '../src/images/SkImageDecoder_ktx.cpp',
+                '../src/images/SkImageDecoder_ktx.h',
                 '../src/images/SkImageDecoder_astc.cpp',
+                '../src/images/SkImageDecoder_astc.h',
               ],
             }],
           ],