Gyp file changes for the android framework.

Split off from https://codereview.chromium.org/140503007/.

The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/140503007/) will
use scripts to create the final makefile.

gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.

gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.

gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.

gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.

gyp/common_variables.gypi:
Add skia_android_framework.

gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.

gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.

gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).

gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.

gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.

gyp/pdf.gyp:
Add dependencies for Android framework.

gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.

BUG=skia:1975
R=djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=13298

Review URL: https://codereview.chromium.org/153093003

git-svn-id: http://skia.googlecode.com/svn/trunk@13304 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 10 insertions, 32 deletions

diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
index cacfab63ba..1f8689ada3 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',
+            ],
+          },
         }
       ],
     }],