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

third_party/harfbuzz-ng/harfbuzz.gyp

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     '../../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
         # anyways. However, we want to have control of the version of harfbuzz
         # we use, so don't use system harfbuzz for official builds, unless we
         # are building for chrome os, where we have the system harfbuzz under
         # 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,
+      }],
     ],
   },
   'conditions': [
     ['use_system_harfbuzz==0', {
       'targets': [
         {
           'target_name': 'harfbuzz-ng',
           'type': 'static_library',
           'defines': [
             'HAVE_OT',
@@ skipping 141 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l harfbuzz)',
             ],
           },
         },
       ],
     }],
   ],
 }