Fix iOS build for webP

gyp/libwebp.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'use_system_libwebp%': 0,
   },
   'conditions': [
     ['use_system_libwebp==0', {
@@ skipping 49 matching lines @@
             ['skia_os == "android"', {
               'dependencies' : [
                 'android_deps.gyp:cpu_features',
               ],
             }],
           ],
         },
         {
           'target_name': 'libwebp_dsp_neon',
           'conditions': [
-            ['armv7 == 1', {
+            ['skia_os in ["android", "ios"]', {

[borenet, 2013/06/11 12:20:07]

What about x86 Android?  I think it might be better to turn armv7=1 in
common_variables.gypi when building for iOS.

               'type': 'static_library',
               'include_dirs': [
                   '../third_party/externals/libwebp',
               ],
               'sources': [
                 '../third_party/externals/libwebp/src/dsp/dec_neon.c',
                 '../third_party/externals/libwebp/src/dsp/enc_neon.c',
                 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
               ],
               # behavior similar dsp_neon.c.neon in an Android.mk
@@ skipping 86 matching lines @@
           'link_settings': {
             'libraries': [
               '-lwebp',
             ],
           },
         }
       ],
     }],
   ],
 }