Gyp file changes for the android framework.

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 6cc8965956f4a517d3e6692ddf92ca873d1659a0..7bb8ca7394e7ae1a61d0ad561a35004d4bb0847a 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -12,8 +12,12 @@
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
       ],
-      'export_dependent_settings': [
-        'libjpeg.gyp:*',
+      'conditions': [
+        [ 'skia_android_framework == 0', {

[djsollen, 2014/02/04 14:18:43]

what problems did this cause?

[scroggo, 2014/02/04 14:37:15]

It adds external/jpeg to LOCAL_EXPORT_C_INCLUDE_DIRS. I don't know that that's a
problem, but it's not necessary.

+          'export_dependent_settings': [
+            'libjpeg.gyp:*',
+          ],
+        }],
       ],
       'include_dirs': [
         '../include/images',
@@ -43,16 +47,26 @@
         '../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_libbmp.cpp',
         '../src/images/SkImageDecoder_libgif.cpp',
         '../src/images/SkImageDecoder_libico.cpp',
+        '../src/images/SkImageDecoder_libwebp.cpp',
         '../src/images/SkImageDecoder_libjpeg.cpp',
         '../src/images/SkImageDecoder_libpng.cpp',
-        '../src/images/SkImageDecoder_libwebp.cpp',
-        '../src/images/SkImageDecoder_wbmp.cpp',
+
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',
         '../src/images/SkImageEncoder_argb.cpp',
@@ -141,8 +155,12 @@
              'android_deps.gyp:gif',
              'android_deps.gyp:png',
           ],
-          'export_dependent_settings': [
-            'android_deps.gyp:png'
+          'conditions': [
+            [ 'skia_android_framework == 0', {

[djsollen, 2014/02/04 14:18:43]

what problems did this cause?

[scroggo, 2014/02/04 14:37:15]

It adds external/libpng to LOCAL_EXPORT_C_INCLUDE_DIRS. Again, it doesn't stop
us from building, but it is not necessary.

+              'export_dependent_settings': [
+                'android_deps.gyp:png'
+              ],
+            }],
           ],
         },{ #else if skia_os != android
           'sources!': [