Use the system provided harfbuzz on chromeos

It's part of the pango library we use already, so by using it, we avoid
a link time collission.

However, if you build just the browser on linux on ubuntu 12, we don't
have such an up to date pango available, so we need to be a bit smart
about whether or not to use the system harfbuzz.

This also allows for treating linker warnings as errors on chromeos

BUG=353127
R=jshin@chromium.org, thakis@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259423

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

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

2 files changed, 41 insertions, 20 deletions

diff --git a/build/check_return_value.py b/build/check_return_value.py
new file mode 100755
index 0000000..6f0daec
--- /dev/null
+++ b/build/check_return_value.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# Copyright 2014 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.
+
+"""This program wraps an arbitrary command and prints "1" if the command ran
+successfully."""
+
+import subprocess
+import sys
+
+if not subprocess.call(sys.argv[1:]):
+  print 1
+else:
+  print 0
diff --git a/build/common.gypi b/build/common.gypi
index 4f64932..4cc5eb2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -35,6 +35,15 @@
 
             # Configure the build for small devices. See crbug.com/318413
             'embedded%': 0,
+
+            'conditions': [
+              # Compute the architecture that we're building on.
+              ['OS=="win" or OS=="mac" or OS=="ios"', {
+                'host_arch%': 'ia32',
+              }, {
+                'host_arch%': '<!(python <(DEPTH)/build/linux/detect_host_arch.py)',
+              }],
+            ],
           },
           # Copy conditionally-set variables out one scope.
           'chromeos%': '<(chromeos)',
@@ -43,6 +52,7 @@
           'use_cras%': '<(use_cras)',
           'use_ozone%': '<(use_ozone)',
           'embedded%': '<(embedded)',
+          'host_arch%': '<(host_arch)',
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
@@ -96,13 +106,6 @@
               'desktop_linux%': 0,
             }],
 
-            # Compute the architecture that we're building on.
-            ['OS=="win" or OS=="mac" or OS=="ios"', {
-              'host_arch%': 'ia32',
-            }, {
-              'host_arch%': '<!(python <(DEPTH)/build/linux/detect_host_arch.py)',
-            }],
-
             # Embedded implies ozone.
             ['embedded==1', {
               'use_ozone%': 1,
@@ -113,6 +116,14 @@
             }, {
               'use_system_fontconfig%': 1,
             }],
+
+            ['OS=="android"', {
+              'target_arch%': 'arm',
+            }, {
+              # Default architecture we're building for is the architecture we're
+              # building on, and possibly sub-architecture (for iOS builds).
+              'target_arch%': '<(host_arch)',
+            }],
           ],
         },
         # Copy conditionally-set variables out one scope.
@@ -130,6 +141,7 @@
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
         'host_arch%': '<(host_arch)',
+        'target_arch%': '<(target_arch)',
 
         'target_subarch%': '',
 
@@ -151,6 +163,10 @@
         'use_goma%': 0,
         'gomadir%': '',
 
+        # The system root for cross-compiles. Default: none.
+        'sysroot%': '',
+        'chroot_cmd%': '',
+
         'conditions': [
           # Ash needs Aura.
           ['use_aura==0', {
@@ -221,13 +237,6 @@
           ['OS=="ios"', {
             'target_subarch%': 'arm32',
           }],
-          ['OS=="android"', {
-            'target_arch%': 'arm',
-          }, {
-            # Default architecture we're building for is the architecture we're
-            # building on, and possibly sub-architecture (for iOS builds).
-            'target_arch%': '<(host_arch)',
-          }],
         ],
       },
 
@@ -258,6 +267,8 @@
       'buildtype%': '<(buildtype)',
       'branding%': '<(branding)',
       'arm_version%': '<(arm_version)',
+      'sysroot%': '<(sysroot)',
+      'chroot_cmd%': '<(chroot_cmd)',
 
       # Whether content/chrome is using mojo: see http://crbug.com/353602
       'use_mojo%': 0,
@@ -286,10 +297,6 @@
       # Detect NEON support at run-time.
       'arm_neon_optional%': 0,
 
-      # The system root for cross-compiles. Default: none.
-      'sysroot%': '',
-      'chroot_cmd%': '',
-
       # The system libdir used for this ABI.
       'system_libdir%': 'lib',
 
@@ -3027,8 +3034,7 @@
     },
   },
   'conditions': [
-    # TODO(jochen): Enable this on chromeos. http://crbug.com/353127
-    ['os_posix==1 and chromeos==0', {
+    ['os_posix==1 and (chromeos==0 or target_arch!="arm")', {
       'target_defaults': {
         'ldflags': [
           '-Wl,--fatal-warnings',