Improve Skia configuration.

skia/skia_library_opts.gyp

Index: skia/skia_library_opts.gyp
===================================================================
--- skia/skia_library_opts.gyp	(revision 227723)
+++ 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',
         '../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',

[djsollen, 2013/10/11 15:05:40]

is config still needed here?

[bungeman-skia, 2013/10/11 15:14:30]

Yes, it is unfortunately. The way this works in gyp is that when dictionaries
are merged, the list entries in the 'nested' dictionary are appended to the list
in the 'parent' dictionary. Since this 'parent' dictionary has an include_dirs
list, the one in skia_common.gypi will be appended to the one here, resulting in
'config' coming after '../third_party/skia/include/config' (since the latter is
listed in this 'parent' dictionary).

         '../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',

[djsollen, 2013/10/11 15:05:40]

same

             '../third_party/skia/include/core',
             '../third_party/skia/src/core',