Revert of Lay groundwork for SkOpts.

gyp/opts.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Gyp file for building opts target.
 {
   # Source lists live in opts.gypi.  This makes it easier to maintain our Chrome GYP/GN setup.
   # (To be honest, I'm not sure why we need to include common.gypi.  I thought it was automatic.)
   'variables': {
     'includes': [ 'common.gypi', 'opts.gypi' ],
@@ skipping 87 matching lines @@
           'cflags': [ '-mssse3' ],
         }],
       ],
     },
     {
       'target_name': 'opts_sse41',
       'product_name': 'skia_opts_sse41',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [ 'core.gyp:*' ],
-      'include_dirs': [ '../src/core' ],
       'sources': [ '<@(sse41_sources)' ],
       'conditions': [
         [ 'skia_os == "win"', {
             'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
         }],
         [ 'not skia_android_framework', {
           'cflags': [ '-msse4.1' ],
         }],
         [ 'skia_os == "mac"', {
           'xcode_settings': { 'GCC_ENABLE_SSE41_EXTENSIONS': 'YES' },
@@ skipping 29 matching lines @@
           ],
         }],
       ],
       'ldflags': [
         '-march=armv7-a',
         '-Wl,--fix-cortex-a8',
       ],
     },
   ],
 }