libwebp: update snapshot to v0.2.0-rc1

third_party/libwebp/libwebp.gyp

Index: third_party/libwebp/libwebp.gyp
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 312887ada31711ee426647ecd47730520fbf6b83..7339fb8bc9ce6cf6c36fd4bda4d5a745226b105f 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -10,26 +10,6 @@
     ['use_system_libwebp==0', {
       'targets': [
         {
-          'target_name': 'libwebp_enc',
-          'type': 'static_library',
-          'include_dirs': ['.'],
-          'sources': [
-            'enc/alpha.c',
-            'enc/analysis.c',
-            'enc/config.c',
-            'enc/cost.c',
-            'enc/filter.c',
-            'enc/frame.c',
-            'enc/iterator.c',
-            'enc/layer.c',
-            'enc/picture.c',
-            'enc/quant.c',
-            'enc/syntax.c',
-            'enc/tree.c',
-            'enc/webpenc.c',
-          ],
-        },
-        {
           'target_name': 'libwebp_dec',
           'type': 'static_library',
           'include_dirs': ['.'],
@@ -43,6 +23,7 @@
             'dec/quant.c',
             'dec/tree.c',
             'dec/vp8.c',
+            'dec/vp8l.c',
             'dec/webp.c',
           ],
         },
@@ -53,15 +34,43 @@
           'sources': [
             'dsp/cpu.c',
             'dsp/dec.c',
-            'dsp/dec_neon.c',
             'dsp/dec_sse2.c',
             'dsp/enc.c',
             'dsp/enc_sse2.c',
+            'dsp/lossless.c',
             'dsp/upsampling.c',
             'dsp/upsampling_sse2.c',
             'dsp/yuv.c',
           ],
           'conditions': [
+            ['OS == "android"', {
+              'include_dirs': ['./dsp'],
+              'sources': [
+                'dsp/cpu-features.c',
+              ],
+            }],
+            ['order_profiling != 0', {
+              'target_conditions' : [
+                ['_toolset=="target"', {
+                  'cflags!': [ '-finstrument-functions' ],
+                }],
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'libwebp_dsp_neon',

[Nico, 2012/08/10 20:01:54]

This causes the following build warning in chrome/mac:


[560/11003] LIBTOOL-STATIC libwebp_dsp_neon.a, POSTBUILDS
libtool: warning for library: libwebp_dsp_neon.a the table of contents is empty
(no object file members in the library define global symbols)


We try very hard to be warning-free, and this is now our only build warning. Can
you please take a look? One possible technique, used by a neon target in webkit,
is to make this target type 'none' on non-neon platforms. Here's how this is
done in third_party/WebKit/Source/WebCore/WebCore.gyp:

    {
      'target_name': 'webcore_arm_neon',
      'conditions': [
        ['target_arch=="arm"', {
          'type': 'static_library',
          'dependencies': [
            'webcore_prerequisites',
          ],
          'hard_dependency': 1,
          'sources': [
            '<@(webcore_files)',
          ],
          'sources/': [
            ['exclude', '.*'],
            ['include', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'],
          ],
          'cflags': ['-marm'],
          'conditions': [
            ['OS=="android"', {
              'cflags!': ['-mthumb'],
            }],
          ],
        },{  # target_arch!="arm"
          'type': 'none',
        }],
      ],
    },

+          'type': 'static_library',
+          'include_dirs': ['.'],
+          'sources': [
+            'dsp/dec_neon.c',
+          ],
+          'conditions': [
+            ['armv7 == 1', {
+              # behavior similar dsp_neon.c.neon in an Android.mk
+              'cflags!': [ '-mfpu=vfpv3-d16' ],
+              'cflags': [ '-mfpu=neon' ],
+            }],
             ['order_profiling != 0', {
               'target_conditions' : [
                 ['_toolset=="target"', {
@@ -72,22 +81,53 @@
           ],
         },
         {
+          'target_name': 'libwebp_enc',
+          'type': 'static_library',
+          'include_dirs': ['.'],
+          'sources': [
+            'enc/alpha.c',
+            'enc/analysis.c',
+            'enc/backward_references.c',
+            'enc/config.c',
+            'enc/cost.c',
+            'enc/filter.c',
+            'enc/frame.c',
+            'enc/histogram.c',
+            'enc/iterator.c',
+            'enc/layer.c',
+            'enc/picture.c',
+            'enc/quant.c',
+            'enc/syntax.c',
+            'enc/tree.c',
+            'enc/vp8l.c',
+            'enc/webpenc.c',
+          ],
+        },
+        {
           'target_name': 'libwebp_utils',
           'type': 'static_library',
           'include_dirs': ['.'],
           'sources': [
             'utils/bit_reader.c',
             'utils/bit_writer.c',
+            'utils/color_cache.c',
+            'utils/filters.c',
+            'utils/huffman.c',
+            'utils/huffman_encode.c',
+            'utils/quant_levels.c',
+            'utils/rescaler.c',
             'utils/thread.c',
+            'utils/utils.c',
           ],
         },
         {
           'target_name': 'libwebp',
           'type': 'none',
           'dependencies' : [
-            'libwebp_enc',
             'libwebp_dec',
             'libwebp_dsp',
+            'libwebp_dsp_neon',
+            'libwebp_enc',
             'libwebp_utils',
           ],
           'direct_dependent_settings': {