Hash :
31aabdfb
Author :
Date :
2015-12-16T10:53:46
gyp: Always use pkg-config wrapper Calling pkg-config directly doesn't work when building with a sysroot image as it will looks for host libraries rather than those within the sysroot. BUG=chromium:569947 Change-Id: I6f3e63c1816cd9393110cb3060744a69a93c9a2e Reviewed-on: https://chromium-review.googlesource.com/318771 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Sam Clegg <sbc@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables':
{
# Assume for the time being that we're never compiling
# standalone ANGLE on Chrome OS.
'chromeos': 0,
# Chromium puts the pkg-config command in a variable because
# calling pkg-config directly doesn't work in a sysroot image.
# See Chromium bug 569947 for more information.
# For standalone builds we don't have this problem so we use
# the regular command.
'pkg-config': 'pkg-config',
# Use a nested variable trick to get use_x11 evaluated more
# eagerly than other conditional variables.
'variables':
{
'conditions':
[
['OS=="linux"',
{
'use_x11': 1,
},
{
'use_x11': 0,
}],
],
},
# Copy conditionally-set variables out one scope.
'use_x11%': '<(use_x11)',
},
}