Make the define of SKIA_HARFBUZZ and the link against harfbuzz.a...

webkit/webkit.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
       'ENABLE_JAVASCRIPT_DEBUGGER=0',
@@ skipping 3954 matching lines @@
           ],
           'cflags': [
             # -Wno-multichar for:
             #   .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
             '-Wno-multichar',
           ],
           # TODO(sgk):  unnecessary once common.gypi gets Linux settings
           # necessary to avoid build failure due to warnings generated by:
           #   ../third_party/WebKit/WebCore/dom/Document.cpp
           'scons_remove' : {'CXXFLAGS' : ['-Werror']},
-          'include_dirs' : [
-            '../third_party/harfbuzz/src',
-            '../third_party/harfbuzz/contrib',
-          ],
-          'defines': [
-            'SKIA_HARFBUZZ',
-          ],
         }],
         ['OS=="mac"', {
           'actions': [
             {
               # Allow framework-style #include of
               # <WebCore/WebCoreSystemInterface.h>.
               'action_name': 'WebCoreSystemInterface.h',
               'inputs': [
                 '../third_party/WebKit/WebCore/platform/mac/WebCoreSystemInterface.h',
               ],
@@ skipping 500 matching lines @@
             'default_plugin/default_plugin.gyp:default_plugin',
           ],
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
           ],
         }],
       ],
     },
   ],
 }