Revert of Fix use of 'sysroot' variable in harfbuzz.gyp

third_party/harfbuzz-ng/harfbuzz.gyp

Index: third_party/harfbuzz-ng/harfbuzz.gyp
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 8580879a8ef6273e3285613a0f3668cfd9e00f65..96e4b7c3e23abc50e3a8c59f3468dc48b60922bb 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -7,6 +7,18 @@
     '../../build/win_precompile.gypi',
   ],
   'variables': {
+    'variables': {
+      'conditions': [
+        ['sysroot!=""', {
+          'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
+        }, {
+          'pkg-config': 'pkg-config'
+        }],
+      ],
+    },
+
+    'pkg-config': '<(pkg-config)',
+
     'conditions': [
       ['OS=="linux" and (buildtype!="Official" or chromeos==1) and embedded==0', {
         # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
@@ -16,6 +28,12 @@
         # control as well.
         'use_system_harfbuzz%': '<!(python ../../build/check_return_value.py <(pkg-config) --atleast-version=1.31.0 pangoft2)',
       }, {
+        'use_system_harfbuzz': 0,
+      }],
+      ['OS=="linux" and target_arch=="arm" and chromeos==0', {
+        # Override use_system_harfbuzz for ARM cross compiling so system
+        # harfbuzz is not used because the corresponding package is not
+        # available.
         'use_system_harfbuzz': 0,
       }],
     ],