harfbuzz: check in harfbuzz-ng, add gyp define to use it

third_party/harfbuzz/harfbuzz.gyp

Index: third_party/harfbuzz/harfbuzz.gyp
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp
index 308b170ea2ff00ad824d431092eb21220db2f976..64535beda24e75f8f57c9641996202b6dfa6beeb 100644
--- a/third_party/harfbuzz/harfbuzz.gyp
+++ b/third_party/harfbuzz/harfbuzz.gyp
@@ -3,47 +3,66 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'harfbuzz',
-      'type': '<(library)',
-      'sources': [
-        'contrib/harfbuzz-freetype.c',
-        'contrib/harfbuzz-unicode.c',
-        'contrib/harfbuzz-unicode-tables.c',
-        'src/harfbuzz-buffer.c',
-        'src/harfbuzz-stream.c',
-        'src/harfbuzz-dump.c',
-        'src/harfbuzz-gdef.c',
-        'src/harfbuzz-gpos.c',
-        'src/harfbuzz-gsub.c',
-        'src/harfbuzz-impl.c',
-        'src/harfbuzz-open.c',
-        'src/harfbuzz-shaper.cpp',
-        'src/harfbuzz-tibetan.c',
-        'src/harfbuzz-khmer.c',
-        'src/harfbuzz-indic.cpp',
-        'src/harfbuzz-hebrew.c',
-        'src/harfbuzz-arabic.c',
-        'src/harfbuzz-hangul.c',
-        'src/harfbuzz-myanmar.c',
-        'src/harfbuzz-thai.c',
+  'conditions': [
+    ['use_harfbuzz_ng==0', {
+      'targets': [
+        {
+          'target_name': 'harfbuzz',
+          'type': '<(library)',
+          'sources': [
+            'contrib/harfbuzz-freetype.c',
+            'contrib/harfbuzz-unicode.c',
+            'contrib/harfbuzz-unicode-tables.c',
+            'src/harfbuzz-buffer.c',
+            'src/harfbuzz-stream.c',
+            'src/harfbuzz-dump.c',
+            'src/harfbuzz-gdef.c',
+            'src/harfbuzz-gpos.c',
+            'src/harfbuzz-gsub.c',
+            'src/harfbuzz-impl.c',
+            'src/harfbuzz-open.c',
+            'src/harfbuzz-shaper.cpp',
+            'src/harfbuzz-tibetan.c',
+            'src/harfbuzz-khmer.c',
+            'src/harfbuzz-indic.cpp',
+            'src/harfbuzz-hebrew.c',
+            'src/harfbuzz-arabic.c',
+            'src/harfbuzz-hangul.c',
+            'src/harfbuzz-myanmar.c',
+            'src/harfbuzz-thai.c',
+          ],
+          'include_dirs': [
+            'contrib',
+            'src',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'contrib',
+              'src',
+            ],
+          },
+          'dependencies': [
+            '../../build/linux/system.gyp:freetype2',
+          ],
+        },
       ],
-      'include_dirs': [
-        'contrib',
-        'src',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'contrib',
-          'src',
-        ],
-      },
-      'dependencies': [
-        '../../build/linux/system.gyp:freetype2',
-      ],
-    },
-  ],
+    }, {  # else, use new harfbuzz
+      'targets': [
+        {
+          # Make the 'harfbuzz' target just shim through to the harfbuzz-ng
+          # one.
+          'target_name': 'harfbuzz',
+          'type': 'settings',
+          'dependencies': [
+            '../harfbuzz-ng/harfbuzz.gyp:harfbuzz'
+          ],
+          'export_dependent_settings': [
+            '../harfbuzz-ng/harfbuzz.gyp:harfbuzz'
+          ],
+        }
+      ]
+    }]
+  ]
 }
 
 # Local Variables: