Improve Skia configuration.

skia/skia_library_opts.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # This gyp file contains the platform-specific optimizations for Skia
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
     # does not allow file-specific CFLAGS, so we must create this extra
     # target for those files to be compiled with -msse2.
     #
     # This is actually only a problem on 32-bit Linux (all Intel Macs have
     # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit
     # SSE2 from instrinsics, which generating plain ol' 386 for everything
     # else).  However, to keep the .gyp file simple and avoid platform-specific
     # build breakage, we do this on all platforms.
 
     # For about the same reason, we need to compile the ARM opts files
     # separately as well.
     {
       'target_name': 'skia_opts',
       'type': 'static_library',
+      'includes': [
+        'skia_common.gypi',
+      ],
       'include_dirs': [
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/src/core',
         '../third_party/skia/src/opts',
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and \
            target_arch != "arm" and target_arch != "mipsel"', {
@@ skipping 87 matching lines @@
         }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
     # gcc to generate SSSE3 code.
     {
       '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',
         '../third_party/skia/src/core',
       ],
       'conditions': [
         [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
           'cflags': [
             '-mssse3',
           ],
@@ skipping 16 matching lines @@
         [ 'target_arch != "arm" and target_arch != "mipsel"', {
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
           ],
         }],
       ],
     },
     {
       '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',
         '../third_party/skia/src/core',
       ],
       'sources': [
         '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
         '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
         '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
         '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
       ],
     },
   ],
   'conditions': [
     # NEON code must be compiled with -mfpu=neon which also affects scalar
     # code. To support dynamic NEON code paths, we need to build all
     # NEON-specific sources in a separate static library. The situation
     # is very similar to the SSSE3 one.
     ['target_arch == "arm" and (arm_neon == 1 or arm_neon_optional == 1)', {
       'targets': [
         {
           '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',
             '../third_party/skia/src/opts',
           ],
           'cflags!': [
             '-fno-omit-frame-pointer',
             '-mfpu=vfp',  # remove them all, just in case.
             '-mfpu=vfpv3',
             '-mfpu=vfpv3-d16',
           ],
@@ skipping 24 matching lines @@
               'defines': [
                 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }