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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 'browser/chromeos/extensions/wallpaper_private_api.cc', 1097 'browser/chromeos/extensions/wallpaper_private_api.cc',
1098 'browser/chromeos/extensions/wallpaper_private_api.h', 1098 'browser/chromeos/extensions/wallpaper_private_api.h',
1099 ], 1099 ],
1100 }, 1100 },
1101 'targets': [ 1101 'targets': [
1102 { 1102 {
1103 # GN version: //chrome/browser/chromeos 1103 # GN version: //chrome/browser/chromeos
1104 'target_name': 'browser_chromeos', 1104 'target_name': 'browser_chromeos',
1105 'type': 'static_library', 1105 'type': 'static_library',
1106 'variables': { 1106 'variables': {
1107 'conditions': [
1108 ['sysroot!=""', {
1109 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)" "<(system_libdir)"',
1110 }, {
1111 'pkg-config': 'pkg-config'
1112 }],
1113 ],
1107 # Override to dynamically link the cras (ChromeOS audio) library. 1114 # Override to dynamically link the cras (ChromeOS audio) library.
1108 'use_cras%': 0, 1115 'use_cras%': 0,
1109 'enable_wexit_time_destructors': 1, 1116 'enable_wexit_time_destructors': 1,
1110 }, 1117 },
1111 'dependencies': [ 1118 'dependencies': [
1112 # TODO(tbarzic): Cleanup this list. 1119 # TODO(tbarzic): Cleanup this list.
1113 'attestation_proto', 1120 'attestation_proto',
1114 'browser/extensions/api/api_registration.gyp:chrome_api_registration', 1121 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
1115 'browser_extensions', 1122 'browser_extensions',
1116 'cert_logger_proto', 1123 'cert_logger_proto',
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 'browser/chromeos/attestation/attestation_signed_data.proto', 1339 'browser/chromeos/attestation/attestation_signed_data.proto',
1333 ], 1340 ],
1334 'variables': { 1341 'variables': {
1335 'proto_in_dir': 'browser/chromeos/attestation', 1342 'proto_in_dir': 'browser/chromeos/attestation',
1336 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1343 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1337 }, 1344 },
1338 'includes': [ '../build/protoc.gypi' ] 1345 'includes': [ '../build/protoc.gypi' ]
1339 }, 1346 },
1340 ], 1347 ],
1341 } 1348 }
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