SkShaper: optionally disable harfbuzz

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index b5ec80473ef7846329b11667e0fc46c5bdf446fa..b41ecc484752f86326caeb27547370aa74c44107 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -463,18 +463,22 @@
     {
       'target_name': 'using_skia_and_harfbuzz',
       'type': 'executable',
-      'sources': [
-        '../tools/using_skia_and_harfbuzz.cpp',
-        '../tools/SkShaper.cpp',
+      'sources': [ '../tools/using_skia_and_harfbuzz.cpp', ],
+      'variables': { 'skia_example_use_harfbuzz%': 1, },
+      'conditions': [
+        [ 'skia_example_use_harfbuzz',
+          {
+            'dependencies': [ 'harfbuzz.gyp:harfbuzz', ],
+            'sources' : [ '../tools/SkShaper_harfbuzz.cpp', ],
+          }, {
+            'sources' : [ '../tools/SkShaper_primitive.cpp', ],
+          },
+        ]
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'pdf.gyp:pdf',
-        'harfbuzz.gyp:harfbuzz',
       ],
-      'cflags': [ '-w', ],
-      'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '0', }, },
-      'xcode_settings': { 'WARNING_CFLAGS': [ '-w', ], },
     },
     {
       'target_name': 'visualize_color_gamut',