Gyp file changes for the android framework.

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

Reverted: https://code.google.com/p/skia/source/detail?r=13304

[scroggo, 2014-02-03 21:36:14]

Splitting this off from https://codereview.chromium.org/140503007/ as Hal is
doing some work on the gyp files and I want to make sure we don't step on each
other.

This is just my changes to the gyp files themselves, without the changes to the
scripts.

[djsollen, 2014-02-04 14:18:43]

https://codereview.chromium.org/153093003/diff/1/gyp/android_framework_lib.gyp
File gyp/android_framework_lib.gyp (right):

https://codereview.chromium.org/153093003/diff/1/gyp/android_framework_lib.gy...
gyp/android_framework_lib.gyp:1: # This GYP file stores the dependencies
necessary to build Skia on the Android
remove this comment and put the copyright header here.

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp
File gyp/images.gyp (right):

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp#newcode16
gyp/images.gyp:16: [ 'skia_android_framework == 0', {
what problems did this cause?

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp#newcode159
gyp/images.gyp:159: [ 'skia_android_framework == 0', {
what problems did this cause?

[scroggo, 2014-02-04 14:37:14]

https://codereview.chromium.org/153093003/diff/1/gyp/android_framework_lib.gyp
File gyp/android_framework_lib.gyp (right):

https://codereview.chromium.org/153093003/diff/1/gyp/android_framework_lib.gy...
gyp/android_framework_lib.gyp:1: # This GYP file stores the dependencies
necessary to build Skia on the Android
On 2014/02/04 14:18:43, djsollen wrote:
> remove this comment and put the copyright header here.

Done.

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp
File gyp/images.gyp (right):

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp#newcode16
gyp/images.gyp:16: [ 'skia_android_framework == 0', {
On 2014/02/04 14:18:43, djsollen wrote:
> what problems did this cause?

It adds external/jpeg to LOCAL_EXPORT_C_INCLUDE_DIRS. I don't know that that's a
problem, but it's not necessary.

https://codereview.chromium.org/153093003/diff/1/gyp/images.gyp#newcode159
gyp/images.gyp:159: [ 'skia_android_framework == 0', {
On 2014/02/04 14:18:43, djsollen wrote:
> what problems did this cause?

It adds external/libpng to LOCAL_EXPORT_C_INCLUDE_DIRS. Again, it doesn't stop
us from building, but it is not necessary.

[djsollen, 2014-02-04 14:40:04]

lgtm

[scroggo, 2014-02-04 14:41:42]

The CQ bit was checked by scroggo@google.com

[skia-commit-bot, 2014-02-04 14:41:46]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/153093003/70001

[skia-commit-bot, 2014-02-04 14:41:48]

The CQ bit was unchecked by skia-commit-bot@chromium.org

[skia-commit-bot, 2014-02-04 14:41:49]

Failed to apply patch for gyp/android_deps.gyp:
While running git apply --index -p1;
  Created missing directory gyp.
  error: gyp/android_deps.gyp: does not exist in index

Patch:       gyp/android_deps.gyp
Index: gyp/android_deps.gyp
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index
cd5b1b0c693c483850957c936265cfbec5aaafc7..1669b2bdad1704164362e8f62307b03a0ee6c797
100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -14,7 +14,68 @@
 # This is due to the fact that we cannot use variables in an includes as the
 # variable expansion step for gyp happens after the includes are processed.
 {
-  'includes': [
-    '../platform_tools/android/gyp/dependencies.gypi',
+  'conditions': [
+    [ 'skia_android_framework == 0',
+      {
+        'includes': [
+          '../platform_tools/android/gyp/dependencies.gypi',
+        ],
+      }, { # else skia_android_framework
+        'cflags': [
+          '-Wno-error'
+        ],
+        'targets': [
+          {
+            'target_name': 'expat',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lexpat',
+              ],
+            },
+          },
+          {
+            'target_name': 'gif',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                'libgif.a',
+              ],
+              'include_dirs': [
+                'external/giflib',
+              ],
+            },
+          },
+          {
+            'target_name': 'png',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lpng',
+              ],
+              'include_dirs': [
+                'external/libpng',
+              ],
+            },
+          },
+          {
+            'target_name': 'jpeg',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-ljpeg',
+              ],
+              'include_dirs': [
+                'external/jpeg',
+              ],
+            },
+          },
+          {
+            'target_name': 'cpu_features',
+            'type': 'none',
+          },
+        ],
+      }
+    ],
   ],
 }

[scroggo, 2014-02-04 14:45:19]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-02-04 14:45:22]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/153093003/170001

[skia-commit-bot, 2014-02-04 14:45:26]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/153093003/170001

[skia-commit-bot, 2014-02-04 14:45:29]

The CQ bit was unchecked by skia-commit-bot@chromium.org

[skia-commit-bot, 2014-02-04 14:45:29]

Failed to apply patch for gyp/android_deps.gyp:
While running git apply --index -p1;
  error: gyp/android_deps.gyp: does not exist in index

Patch:       gyp/android_deps.gyp
Index: gyp/android_deps.gyp
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index
cd5b1b0c693c483850957c936265cfbec5aaafc7..1669b2bdad1704164362e8f62307b03a0ee6c797
100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -14,7 +14,68 @@
 # This is due to the fact that we cannot use variables in an includes as the
 # variable expansion step for gyp happens after the includes are processed.
 {
-  'includes': [
-    '../platform_tools/android/gyp/dependencies.gypi',
+  'conditions': [
+    [ 'skia_android_framework == 0',
+      {
+        'includes': [
+          '../platform_tools/android/gyp/dependencies.gypi',
+        ],
+      }, { # else skia_android_framework
+        'cflags': [
+          '-Wno-error'
+        ],
+        'targets': [
+          {
+            'target_name': 'expat',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lexpat',
+              ],
+            },
+          },
+          {
+            'target_name': 'gif',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                'libgif.a',
+              ],
+              'include_dirs': [
+                'external/giflib',
+              ],
+            },
+          },
+          {
+            'target_name': 'png',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lpng',
+              ],
+              'include_dirs': [
+                'external/libpng',
+              ],
+            },
+          },
+          {
+            'target_name': 'jpeg',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-ljpeg',
+              ],
+              'include_dirs': [
+                'external/jpeg',
+              ],
+            },
+          },
+          {
+            'target_name': 'cpu_features',
+            'type': 'none',
+          },
+        ],
+      }
+    ],
   ],
 }

[scroggo, 2014-02-04 14:50:26]

Committed patchset #3 manually as r13298 (presubmit successful).

[scroggo, 2014-02-04 15:33:43]

A revert of this CL has been created in
https://codereview.chromium.org/153923002/ by scroggo@google.com.

The reason for reverting is: Android fails to run bench and bench_pictures. I
need to figure out why..

[scroggo, 2014-02-04 16:08:56]

Committed patchset #4 manually as r13304 (presubmit successful).

[scroggo, 2014-02-04 17:48:56]

On 2014/02/04 16:08:56, scroggo wrote:
> Committed patchset #4 manually as r13304 (presubmit successful).

r13304 is actually a revert of this CL.

The patch has been uploaded for relanding (with the problems fixed) at
https://codereview.chromium.org/154053002/