Improve Skia configuration.

skia/skia_library_opts.gyp

Index: skia/skia_library_opts.gyp
===================================================================
--- skia/skia_library_opts.gyp	(revision 225491)
+++ skia/skia_library_opts.gyp	(working copy)
@@ -27,6 +27,9 @@
     {
       'target_name': 'skia_opts',
       'type': 'static_library',
+      'includes': [
+        'skia_common.gypi',
+      ],
       'include_dirs': [
         'config',
         '../third_party/skia/include/config',
@@ -134,8 +137,10 @@
     {
       'target_name': 'skia_opts_ssse3',
       'type': 'static_library',
+      'includes': [
+        'skia_common.gypi',
+      ],
       'include_dirs': [
-        '..',
         'config',

[bungeman-skia, 2013/09/27 17:59:13]

'config' still needs to be listed here in this case since includes are expanded
into the containing dict and the contents appended on list merges. We need to
ensure that 'config' comes before ../third_party/skia/include/config to get the
right SkUserConfig.h. I've talked to reed about this, and he's ok with a future
change to have a (mostly required) compile define like SK_USER_CONFIG_H so that
the include order is less important. With that change, we can remove the
'config' includes in this file as well.

         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
@@ -172,8 +177,10 @@
     {
       'target_name': 'skia_opts_none',
       'type': 'static_library',
+      'includes': [
+        'skia_common.gypi',
+      ],
       'include_dirs': [
-        '..',
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
@@ -197,8 +204,10 @@
         {
           'target_name': 'skia_opts_neon',
           'type': 'static_library',
+          'includes': [
+            'skia_common.gypi',
+          ],
           'include_dirs': [
-            '..',
             'config',
             '../third_party/skia/include/core',
             '../third_party/skia/src/core',