Gyp file changes for the android framework.

gyp/libwebp.gyp

Index: gyp/libwebp.gyp
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
index cacfab63baf96697a78cc7985fb90e39dcf39a31..1f8689ada3dfc84747b0b128e60d75f66acb6a1e 100644
--- a/gyp/libwebp.gyp
+++ b/gyp/libwebp.gyp
@@ -4,13 +4,7 @@
 
 {
   'variables': {
-    'conditions':[
-      ['skia_android_framework == 1', {
-        'use_system_libwebp': 1,
-      }, {
-        'use_system_libwebp%': 0,
-      }],
-    ],
+    'use_system_libwebp%': 0,
   },
   'conditions': [
     ['use_system_libwebp==0', {
@@ -162,36 +156,20 @@
         },
       ],
     }, {
-      # use_system_libwep == 1
       'targets': [
         {
           'target_name': 'libwebp',
           'type': 'none',
-          'conditions': [
-            [ 'skia_android_framework', {
-              'direct_dependent_settings': {
-                'libraries': [
-                  'libwebp-decode.a',
-                  'libwebp-encode.a',
-                ],
-              'include_dirs': [
-                'external/webp/include',
-              ],
-              },
-            }, { # skia_android_framework == 0
-              'direct_dependent_settings': {
-                'defines': [
-                  'ENABLE_WEBP',
-                ],
-                },
-                'link_settings': {
-                  'libraries': [
-                    '-lwebp',
-                  ],
-                },
-              },
+          'direct_dependent_settings': {
+            'defines': [
+              'ENABLE_WEBP',
             ],
-          ],
+          },
+          'link_settings': {
+            'libraries': [
+              '-lwebp',
+            ],
+          },
         }
       ],
     }],