Use the system harfbuzz library on chrome os

BUG=353127
R=jshin@chromium.org

Review URL: https://codereview.chromium.org/214413003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260202 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 16 deletions

diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 304fcfd..7bd7d1d 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -20,10 +20,12 @@
     'pkg-config': '<(pkg-config)',
 
     'conditions': [
-      ['OS=="linux" and buildtype!="Official" and chromeos==0', {
+      ['OS=="linux" and (buildtype!="Official" or chromeos==1)', {
         # 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.
+        # 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,
@@ -171,34 +173,24 @@
         },
       ],
     }, {  # use_system_harfbuzz==1
-      'variables': {
-        # Check for presence of harfbuzz-icu library, use it if present.
-        'harfbuzz_libraries':
-            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-            '--code "int main() { return 0; }" '
-            '--run-linker '
-            '--on-success "harfbuzz harfbuzz-icu" '
-            '--on-failure "harfbuzz" '
-            '-- -lharfbuzz-icu)',
-      },
       'targets': [
         {
           'target_name': 'harfbuzz-ng',
           'type': 'none',
           'cflags': [
-            '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))',
+            '<!@(<(pkg-config) --cflags harfbuzz)',
           ],
           'direct_dependent_settings': {
             'cflags': [
-              '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))',
+              '<!@(<(pkg-config) --cflags harfbuzz)',
             ],
           },
           'link_settings': {
             'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other <(harfbuzz_libraries))',
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other harfbuzz)',
             ],
             'libraries': [
-              '<!@(<(pkg-config) --libs-only-l <(harfbuzz_libraries))',
+              '<!@(<(pkg-config) --libs-only-l harfbuzz)',
             ],
           },
         },