Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(938)

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 1146303007: Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/linux/system.gyp ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': { 7 'variables': {
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'browser_chromeos_sources': [ 9 'browser_chromeos_sources': [
10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 'browser/chromeos/extensions/wallpaper_private_api.cc', 1099 'browser/chromeos/extensions/wallpaper_private_api.cc',
1100 'browser/chromeos/extensions/wallpaper_private_api.h', 1100 'browser/chromeos/extensions/wallpaper_private_api.h',
1101 ], 1101 ],
1102 }, 1102 },
1103 'targets': [ 1103 'targets': [
1104 { 1104 {
1105 # GN version: //chrome/browser/chromeos 1105 # GN version: //chrome/browser/chromeos
1106 'target_name': 'browser_chromeos', 1106 'target_name': 'browser_chromeos',
1107 'type': 'static_library', 1107 'type': 'static_library',
1108 'variables': { 1108 'variables': {
1109 'conditions': [
1110 ['sysroot!=""', {
1111 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)" "<(system_libdir)"',
1112 }, {
1113 'pkg-config': 'pkg-config'
1114 }],
1115 ],
1116 # Override to dynamically link the cras (ChromeOS audio) library. 1109 # Override to dynamically link the cras (ChromeOS audio) library.
1117 'use_cras%': 0, 1110 'use_cras%': 0,
1118 'enable_wexit_time_destructors': 1, 1111 'enable_wexit_time_destructors': 1,
1119 }, 1112 },
1120 'dependencies': [ 1113 'dependencies': [
1121 # TODO(tbarzic): Cleanup this list. 1114 # TODO(tbarzic): Cleanup this list.
1122 'attestation_proto', 1115 'attestation_proto',
1123 'browser/extensions/api/api_registration.gyp:chrome_api_registration', 1116 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
1124 'browser_extensions', 1117 'browser_extensions',
1125 'cert_logger_proto', 1118 'cert_logger_proto',
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 'browser/chromeos/attestation/attestation_signed_data.proto', 1334 'browser/chromeos/attestation/attestation_signed_data.proto',
1342 ], 1335 ],
1343 'variables': { 1336 'variables': {
1344 'proto_in_dir': 'browser/chromeos/attestation', 1337 'proto_in_dir': 'browser/chromeos/attestation',
1345 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1338 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1346 }, 1339 },
1347 'includes': [ '../build/protoc.gypi' ] 1340 'includes': [ '../build/protoc.gypi' ]
1348 }, 1341 },
1349 ], 1342 ],
1350 } 1343 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698