Revert of Use the system provided harfbuzz on chromeos (https://codereview.chromium.org/203163003/)
Reason for revert: Revert as speculative cause for build failure. http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/17405/steps/Report/logs/stdio Original issue's description: > 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 TBR=jshin@chromium.org,thakis@chromium.org,jochen@chromium.org NOTREECHECKS=true NOTRY=true BUG=353127 Review URL: https://codereview.chromium.org/211473008 git-svn-id: http://src.chromium.org/svn/trunk/src/build@259439 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
a3e651e42b
Коммит
39d7d82d43
|
@ -1,15 +0,0 @@
|
|||
#!/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
|
46
common.gypi
46
common.gypi
|
@ -35,15 +35,6 @@
|
|||
|
||||
# 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)',
|
||||
|
@ -52,7 +43,6 @@
|
|||
'use_cras%': '<(use_cras)',
|
||||
'use_ozone%': '<(use_ozone)',
|
||||
'embedded%': '<(embedded)',
|
||||
'host_arch%': '<(host_arch)',
|
||||
|
||||
# Whether we are using Views Toolkit
|
||||
'toolkit_views%': 0,
|
||||
|
@ -106,6 +96,13 @@
|
|||
'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,
|
||||
|
@ -116,14 +113,6 @@
|
|||
}, {
|
||||
'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.
|
||||
|
@ -141,7 +130,6 @@
|
|||
'buildtype%': '<(buildtype)',
|
||||
'branding%': '<(branding)',
|
||||
'host_arch%': '<(host_arch)',
|
||||
'target_arch%': '<(target_arch)',
|
||||
|
||||
'target_subarch%': '',
|
||||
|
||||
|
@ -163,10 +151,6 @@
|
|||
'use_goma%': 0,
|
||||
'gomadir%': '',
|
||||
|
||||
# The system root for cross-compiles. Default: none.
|
||||
'sysroot%': '',
|
||||
'chroot_cmd%': '',
|
||||
|
||||
'conditions': [
|
||||
# Ash needs Aura.
|
||||
['use_aura==0', {
|
||||
|
@ -237,6 +221,13 @@
|
|||
['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)',
|
||||
}],
|
||||
],
|
||||
},
|
||||
|
||||
|
@ -267,8 +258,6 @@
|
|||
'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,
|
||||
|
@ -297,6 +286,10 @@
|
|||
# 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',
|
||||
|
||||
|
@ -3034,7 +3027,8 @@
|
|||
},
|
||||
},
|
||||
'conditions': [
|
||||
['os_posix==1', {
|
||||
# TODO(jochen): Enable this on chromeos. http://crbug.com/353127
|
||||
['os_posix==1 and chromeos==0', {
|
||||
'target_defaults': {
|
||||
'ldflags': [
|
||||
'-Wl,--fatal-warnings',
|
||||
|
|
Загрузка…
Ссылка в новой задаче