X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Flibwebp%2Flibwebp.gyp;h=e4e1b97ab5fe60298dd8e7c767fe9b938e23cee9;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=49526df720c0a787a35608ae763c6011c5820ab3;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/libwebp/libwebp.gyp b/src/third_party/libwebp/libwebp.gyp
index 49526df..e4e1b97 100644
--- a/src/third_party/libwebp/libwebp.gyp
+++ b/src/third_party/libwebp/libwebp.gyp
@@ -3,6 +3,14 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'neon_sources': [
+      'dsp/dec_neon.c',
+      'dsp/enc_neon.c',
+      'dsp/lossless_neon.c',
+      'dsp/upsampling_neon.c',
+    ]
+  },
   'targets': [
     {
       'target_name': 'libwebp_dec',
@@ -19,7 +27,6 @@
         'dec/frame.c',
         'dec/idec.c',
         'dec/io.c',
-        'dec/layer.c',
         'dec/quant.c',
         'dec/tree.c',
         'dec/vp8.c',
@@ -40,15 +47,24 @@
       'type': 'static_library',
       'include_dirs': ['.'],
       'sources': [
+        'dsp/alpha_processing.c',
         'dsp/cpu.c',
         'dsp/dec.c',
+        'dsp/dec_clip_tables.c',
+        'dsp/dec_mips32.c',
         'dsp/dec_sse2.c',
         'dsp/enc.c',
+        'dsp/enc_avx2.c',
+        'dsp/enc_mips32.c',
         'dsp/enc_sse2.c',
         'dsp/lossless.c',
+        'dsp/lossless_mips32.c',
+        'dsp/lossless_sse2.c',
         'dsp/upsampling.c',
         'dsp/upsampling_sse2.c',
         'dsp/yuv.c',
+        'dsp/yuv_mips32.c',
+        'dsp/yuv_sse2.c',
       ],
       'conditions': [
         ['OS == "android"', {
@@ -70,15 +86,25 @@
           'type': 'static_library',
           'include_dirs': ['.'],
           'sources': [
-            'dsp/dec_neon.c',
-            'dsp/enc_neon.c',
-            'dsp/upsampling_neon.c',
+            '<@(neon_sources)'
           ],
           # behavior similar to *.c.neon in an Android.mk
           'cflags!': [ '-mfpu=vfpv3-d16' ],
           'cflags': [ '-mfpu=neon' ],
-        },{  # "target_arch != "arm" or arm_version < 7"
-          'type': 'none',
+        },{
+          'conditions': [
+            ['target_arch == "arm64"', {
+              'type': 'static_library',
+              'include_dirs': ['.'],
+              'sources': [
+                '<@(neon_sources)'
+              ],
+              # avoid an ICE with gcc-4.9: b/15574841
+              'cflags': [ '-frename-registers' ],
+            },{  # "target_arch != "arm|arm64" or arm_version < 7"
+              'type': 'none',
+            }],
+          ],
         }],
         ['order_profiling != 0', {
           'target_conditions' : [
@@ -103,8 +129,11 @@
         'enc/frame.c',
         'enc/histogram.c',
         'enc/iterator.c',
-        'enc/layer.c',
         'enc/picture.c',
+        'enc/picture_csp.c',
+        'enc/picture_psnr.c',
+        'enc/picture_rescale.c',
+        'enc/picture_tools.c',
         'enc/quant.c',
         'enc/syntax.c',
         'enc/token.c',
@@ -118,7 +147,6 @@
       'type': 'static_library',
       'include_dirs': ['.'],
       'sources': [
-        'utils/alpha_processing.c',
         'utils/bit_reader.c',
         'utils/bit_writer.c',
         'utils/color_cache.c',